From 59153219a5034139feb4a9d55307f1a760a8d472 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 20:07:34 +0800 Subject: [PATCH 01/10] ci: add arm64 linux pipeline --- .github/workflows/kvrocks.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index a203f892d0d..18ba1bd08c9 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -200,6 +200,9 @@ jobs: os: ubuntu-22.04 compiler: clang new_encoding: -DENABLE_NEW_ENCODING=FALSE + - name: Ubuntu Arm64 + os: [self-hosted, Linux, ARM64] + compiler: auto runs-on: ${{ matrix.os }} env: From 9c71a493cdfe593cd769fd9f5078261bcaa62818 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 20:37:06 +0800 Subject: [PATCH 02/10] install libssl-dev --- .github/workflows/kvrocks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 18ba1bd08c9..21202f8524f 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -219,7 +219,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu') }} run: | sudo apt update - sudo apt install -y ninja-build + sudo apt install -y ninja-build libssl-dev echo "NPROC=$(nproc)" >> $GITHUB_ENV - name: Cache redis From 3ae55a72129b0f2ea7d9e998b5b952c2421f6202 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 22:18:20 +0800 Subject: [PATCH 03/10] fix dep install --- .github/workflows/kvrocks.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 21202f8524f..0c76d6c45c6 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -203,6 +203,7 @@ jobs: - name: Ubuntu Arm64 os: [self-hosted, Linux, ARM64] compiler: auto + arm_linux: true runs-on: ${{ matrix.os }} env: @@ -216,7 +217,7 @@ jobs: echo "NPROC=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV echo "CMAKE_EXTRA_DEFS=-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl" >> $GITHUB_ENV - name: Setup Linux - if: ${{ startsWith(matrix.os, 'ubuntu') }} + if: ${{ startsWith(matrix.os, 'ubuntu') || matrix.arm_linux }} run: | sudo apt update sudo apt install -y ninja-build libssl-dev From fa78326bb10367efb85a77b70aedd0f2325167b2 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 22:19:56 +0800 Subject: [PATCH 04/10] tmp disable precheck --- .github/workflows/kvrocks.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 0c76d6c45c6..a5e97f9f6d9 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -104,8 +104,8 @@ jobs: build-and-test: name: Build and test - needs: [precondition, check-and-lint, check-typos] - if: ${{ needs.precondition.outputs.docs_only != 'true' }} + # needs: [precondition, check-and-lint, check-typos] + # if: ${{ needs.precondition.outputs.docs_only != 'true' }} strategy: fail-fast: false matrix: From fb977bc8341a3357a01ea9537d44606feff1a4c2 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 22:34:25 +0800 Subject: [PATCH 05/10] python install --- .github/workflows/kvrocks.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index a5e97f9f6d9..2828e0cd3e0 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -250,8 +250,11 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-python@v5 + if: ${{ !matrix.arm_linux }} with: python-version: 3.x + - run: apt install python3 python3-pip + if ${{ matrix.arm_linux }} - uses: actions/setup-go@v5 with: go-version-file: 'tests/gocase/go.mod' From dbb875ef5ecc536693777e44f7672df8e3f87dee Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 22:37:53 +0800 Subject: [PATCH 06/10] fix --- .github/workflows/kvrocks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 2828e0cd3e0..8329f850d37 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -254,7 +254,7 @@ jobs: with: python-version: 3.x - run: apt install python3 python3-pip - if ${{ matrix.arm_linux }} + if: ${{ matrix.arm_linux }} - uses: actions/setup-go@v5 with: go-version-file: 'tests/gocase/go.mod' From eeb7040fc54e686d3377e67732292cf14967bc20 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 22:56:26 +0800 Subject: [PATCH 07/10] fix --- .github/workflows/kvrocks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 8329f850d37..30d7a559b06 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -253,7 +253,7 @@ jobs: if: ${{ !matrix.arm_linux }} with: python-version: 3.x - - run: apt install python3 python3-pip + - run: sudo apt install python3 python3-pip if: ${{ matrix.arm_linux }} - uses: actions/setup-go@v5 with: From 9025b82dcd3e61e3c27a97d3b56c3ff90a62790e Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 23:02:56 +0800 Subject: [PATCH 08/10] fix --- .github/workflows/kvrocks.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 30d7a559b06..466133378b4 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -220,8 +220,12 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu') || matrix.arm_linux }} run: | sudo apt update - sudo apt install -y ninja-build libssl-dev + sudo apt install -y ninja-build echo "NPROC=$(nproc)" >> $GITHUB_ENV + - name: Setup Linux ARM64 + if: ${{ matrix.arm_linux }} + run: | + sudo apt install -y git build-essential cmake libtool python3 python3-pip libssl-dev - name: Cache redis id: cache-redis @@ -253,8 +257,6 @@ jobs: if: ${{ !matrix.arm_linux }} with: python-version: 3.x - - run: sudo apt install python3 python3-pip - if: ${{ matrix.arm_linux }} - uses: actions/setup-go@v5 with: go-version-file: 'tests/gocase/go.mod' From 564ae9a4b16085e181f851c68f0bcfb7cb7eb84b Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Fri, 11 Oct 2024 23:05:19 +0800 Subject: [PATCH 09/10] fix --- .github/workflows/kvrocks.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 466133378b4..07b3f067d92 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -223,9 +223,9 @@ jobs: sudo apt install -y ninja-build echo "NPROC=$(nproc)" >> $GITHUB_ENV - name: Setup Linux ARM64 - if: ${{ matrix.arm_linux }} - run: | - sudo apt install -y git build-essential cmake libtool python3 python3-pip libssl-dev + if: ${{ matrix.arm_linux }} + run: | + sudo apt install -y git build-essential cmake libtool python3 python3-pip libssl-dev - name: Cache redis id: cache-redis From 20976236e6bea45dc32c8165d6cc26ad82b08fce Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Sat, 12 Oct 2024 00:11:41 +0800 Subject: [PATCH 10/10] change back --- .github/workflows/kvrocks.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 07b3f067d92..1effb52d278 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -104,8 +104,8 @@ jobs: build-and-test: name: Build and test - # needs: [precondition, check-and-lint, check-typos] - # if: ${{ needs.precondition.outputs.docs_only != 'true' }} + needs: [precondition, check-and-lint, check-typos] + if: ${{ needs.precondition.outputs.docs_only != 'true' }} strategy: fail-fast: false matrix: