From cb60cfebaad68d928574284ed912950229a612bf Mon Sep 17 00:00:00 2001 From: chejinge Date: Mon, 4 Nov 2024 16:51:52 +0800 Subject: [PATCH 1/8] feat:add macos test --- .github/workflows/pika.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml index 79320d7a0..f08b7302e 100644 --- a/.github/workflows/pika.yml +++ b/.github/workflows/pika.yml @@ -218,7 +218,7 @@ jobs: run: | cd tests/integration/ chmod +x integrate_test.sh - # sh integrate_test.sh + sh integrate_test.sh build_pika_image: name: Build Pika Docker image From c36fd12fcec9196b397f5a7b4504cc15040ecfc7 Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 15:01:13 +0800 Subject: [PATCH 2/8] fixci --- tests/integration/start_codis.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/start_codis.sh b/tests/integration/start_codis.sh index c686251eb..a16d9fa20 100755 --- a/tests/integration/start_codis.sh +++ b/tests/integration/start_codis.sh @@ -29,6 +29,8 @@ sed -i '' -e 's|databases : 1|databases : 2|' -e 's|port : 9221|port : 8001|' -e #ensure both master and slave are ready sleep 10 +pwd + cd ../codis make From caebd7a4dd6807c31e433b2c29e2129d9ae715b2 Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 15:07:32 +0800 Subject: [PATCH 3/8] fixci --- tests/integration/start_codis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/start_codis.sh b/tests/integration/start_codis.sh index a16d9fa20..b6fadb15e 100755 --- a/tests/integration/start_codis.sh +++ b/tests/integration/start_codis.sh @@ -30,6 +30,7 @@ sed -i '' -e 's|databases : 1|databases : 2|' -e 's|port : 9221|port : 8001|' -e sleep 10 pwd +echo "$(pwd)" cd ../codis make From bb02d3a13790a97cf21171e5a6aca53be5ab114d Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 15:33:12 +0800 Subject: [PATCH 4/8] fixci --- tests/integration/start_codis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/start_codis.sh b/tests/integration/start_codis.sh index b6fadb15e..728052652 100755 --- a/tests/integration/start_codis.sh +++ b/tests/integration/start_codis.sh @@ -32,7 +32,7 @@ sleep 10 pwd echo "$(pwd)" -cd ../codis +cd ../../codis make echo 'startup codis dashboard and codis proxy' From 087cd0ca5a64497981daabd53d38ee38c1e446ea Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 16:37:54 +0800 Subject: [PATCH 5/8] fixci --- tests/integration/start_codis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/start_codis.sh b/tests/integration/start_codis.sh index 728052652..b6fadb15e 100755 --- a/tests/integration/start_codis.sh +++ b/tests/integration/start_codis.sh @@ -32,7 +32,7 @@ sleep 10 pwd echo "$(pwd)" -cd ../../codis +cd ../codis make echo 'startup codis dashboard and codis proxy' From e1babbf435cd2da9c679bb8ea6097605cee45843 Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 16:51:38 +0800 Subject: [PATCH 6/8] fixci --- .github/workflows/pika.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml index f08b7302e..bcce402b5 100644 --- a/.github/workflows/pika.yml +++ b/.github/workflows/pika.yml @@ -204,19 +204,18 @@ jobs: ./pikatests.sh all clean - name: Start codis, pika master and pika slave - working-directory: ${{ github.workspace }} + working-directory: ${{ github.workspace }}/build run: | - cd tests/integration/ - chmod +x start_master_and_slave.sh - ./start_master_and_slave.sh - chmod +x start_codis.sh - ./start_codis.sh + 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 - name: Run Go E2E Tests - working-directory: ${{ github.workspace }} + working-directory: ${{ github.workspace }}/build run: | - cd tests/integration/ + cd ../../tests/integration/ chmod +x integrate_test.sh sh integrate_test.sh From f59c753d4a530e341eebe7ed2899ddc1433d560a Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 17:53:53 +0800 Subject: [PATCH 7/8] fixci --- .github/workflows/pika.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml index bcce402b5..7360d1ddb 100644 --- a/.github/workflows/pika.yml +++ b/.github/workflows/pika.yml @@ -31,6 +31,18 @@ jobs: with: key: ubuntu-latest + - name: Uninstall Existing zlib + run: | + # Uninstall existing zlib to avoid conflicts + brew uninstall --ignore-dependencies zlib || true + + - name: Reinstall New zlib + run: | + # Install new zlib version + brew install zlib + # Verify installation and path + brew link --force zlib + - name: Install Deps run: | sudo apt-get update From 04d5d0eae078ecdd9537523a6624ed2b9b1aa0c9 Mon Sep 17 00:00:00 2001 From: chejinge Date: Tue, 5 Nov 2024 17:58:53 +0800 Subject: [PATCH 8/8] fixci --- .github/workflows/pika.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml index 7360d1ddb..808f5d1f2 100644 --- a/.github/workflows/pika.yml +++ b/.github/workflows/pika.yml @@ -31,18 +31,6 @@ jobs: with: key: ubuntu-latest - - name: Uninstall Existing zlib - run: | - # Uninstall existing zlib to avoid conflicts - brew uninstall --ignore-dependencies zlib || true - - - name: Reinstall New zlib - run: | - # Install new zlib version - brew install zlib - # Verify installation and path - brew link --force zlib - - name: Install Deps run: | sudo apt-get update @@ -184,6 +172,18 @@ jobs: with: key: macos-13 + - name: Uninstall Existing zlib + run: | + # Uninstall existing zlib to avoid conflicts + brew uninstall --ignore-dependencies zlib || true + + - name: Reinstall New zlib + run: | + # Install new zlib version + brew install zlib + # Verify installation and path + brew link --force zlib + - name: Install Deps run: | brew update