Skip to content

Commit

Permalink
fix:macos13 (OpenAtomFoundation#2937)
Browse files Browse the repository at this point in the history
* fix:macos13
---------

Co-authored-by: chejinge <[email protected]>
  • Loading branch information
chejinge and brother-jin authored Nov 1, 2024
1 parent b5cdb2f commit 0c37b04
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
31 changes: 17 additions & 14 deletions .github/workflows/pika.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ jobs:
sh integrate_test.sh
build_on_macos:
runs-on: macos-12

runs-on: macos-13

steps:
- uses: actions/checkout@v4
Expand All @@ -169,7 +170,7 @@ jobs:
- name: ccache
uses: hendrikmuhs/[email protected]
with:
key: macos-12
key: macos-13

- name: Install Deps
run: |
Expand All @@ -188,8 +189,10 @@ jobs:
- name: Cleanup
run: |
rm -rf ./deps
rm -rf ./buildtrees
cp deps/lib/libz.1.dylib .
cp deps/lib/libz.1.dylib tests/integration/
rm -rf ./deps
rm -rf ./buildtree
- name: Test
working-directory: ${{ github.workspace }}/build
Expand All @@ -201,21 +204,21 @@ jobs:
./pikatests.sh all clean
- name: Start codis, pika master and pika slave
working-directory: ${{ github.workspace }}/build
working-directory: ${{ github.workspace }}
run: |
chmod +x ../tests/integration/start_master_and_slave.sh
../tests/integration/start_master_and_slave.sh
chmod +x ../tests/integration/start_codis.sh
../tests/integration/start_codis.sh
cd tests/integration/
chmod +x start_master_and_slave.sh
./start_master_and_slave.sh
chmod +x start_codis.sh
./start_codis.sh
- name: Run Go E2E Tests
working-directory: ${{ github.workspace }}/build
working-directory: ${{ github.workspace }}
run: |
cd ../tools/pika_keys_analysis/
go test -v ./...
cd ../../tests/integration/
cd tests/integration/
chmod +x integrate_test.sh
sh integrate_test.sh
# sh integrate_test.sh

build_pika_image:
name: Build Pika Docker image
Expand Down
8 changes: 4 additions & 4 deletions codis/config/proxy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ session_break_on_failure = false
# Slowlog-log-slower-than(us), from receive command to send response, 0 is allways print slow log
slowlog_log_slower_than = 100000

# quick command list e.g. get, set
quick_cmd_list = ""
# slow command list e.g. hgetall, mset
slow_cmd_list = ""
# quick command list
quick_cmd_list = "get,set"
# slow command list
slow_cmd_list = "mget, mset"

# Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
metrics_report_server = ""
Expand Down
1 change: 1 addition & 0 deletions pikatests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function setup_pika_bin {
exit 1
fi
cp $PIKA_BIN src/redis-server
cp $PIKA_BIN tests/integration/pika
cp tests/conf/pika.conf tests/assets/default.conf
}

Expand Down

0 comments on commit 0c37b04

Please sign in to comment.