Skip to content

Commit

Permalink
fix:macos13 (#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 committed Dec 25, 2024
1 parent be1bb7a commit 620a576
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
31 changes: 17 additions & 14 deletions .github/workflows/pika.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ jobs:
sh integrate_test.sh
build_on_macos:
runs-on: macos-12

runs-on: macos-13

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

- name: Install Deps
run: |
Expand All @@ -255,8 +256,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 @@ -268,21 +271,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
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 620a576

Please sign in to comment.