From 22fddb644d751d88b48dbfe8b9fb0ae42ec2e2ea Mon Sep 17 00:00:00 2001 From: git-hulk Date: Mon, 9 May 2022 19:49:22 +0800 Subject: [PATCH 1/6] CI also builds with CMake on ubuntu Currently, Kvrocks supported make and cmake ways to build the source, but CI workflow only check the make command. To be more rigorous, we need to also check the cmake way. --- .github/workflows/kvrocks.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 42422c556c4..4a92cef112a 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -78,6 +78,27 @@ jobs: cd tests/tcl && sh runtest sh runtest --single integration/redis-cli && cd - + build-on-ubuntu-with-cmake: + strategy: + matrix: + os: [ubuntu-18.04] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout Code Base + uses: actions/checkout@v2.3.4 + with: + fetch-depth: 64 + + - name: Install Dependencies + run: | + sudo apt update + sudo apt-get install -y gcc g++ cmake + mkdir _build + + - name: Build + run: | + sh build.sh _build + build-on-macos-latest: runs-on: macos-11 steps: From ad1f45bce380b0c9426a2959e0e7bc07136981ae Mon Sep 17 00:00:00 2001 From: git-hulk Date: Mon, 9 May 2022 20:11:48 +0800 Subject: [PATCH 2/6] Lint and build jobs should wait for checking license --- .github/workflows/kvrocks.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index 4a92cef112a..697de5b97c4 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -34,6 +34,7 @@ jobs: matrix: os: [ubuntu-18.04] runs-on: ${{ matrix.os }} + needs: license # wait for license job steps: - name: Checkout Code Base uses: actions/checkout@v2.3.4 @@ -83,6 +84,7 @@ jobs: matrix: os: [ubuntu-18.04] runs-on: ${{ matrix.os }} + needs: license # wait for license job steps: - name: Checkout Code Base uses: actions/checkout@v2.3.4 @@ -101,6 +103,7 @@ jobs: build-on-macos-latest: runs-on: macos-11 + needs: license # wait for license job steps: - name: Checkout Code Base uses: actions/checkout@v2.3.4 From ef12430d42b340189d075b6191d4c2c4a33adc2f Mon Sep 17 00:00:00 2001 From: git-hulk Date: Mon, 9 May 2022 20:47:23 +0800 Subject: [PATCH 3/6] Only builds kvrocks and kvrocks2redis --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5a87e05c152..f0d4d720af2 100755 --- a/build.sh +++ b/build.sh @@ -65,4 +65,4 @@ fi git submodule init git submodule update -cd $BUILD_DIR && $CMAKE_BIN -DCMAKE_BUILD_TYPE=Release .. && make -j4 +cd $BUILD_DIR && $CMAKE_BIN -DCMAKE_BUILD_TYPE=Release .. && make -j4 kvrocks kvrocks2redis From bb8829f153769214d825d3d9a4d4a73e9b39037d Mon Sep 17 00:00:00 2001 From: hulk Date: Mon, 9 May 2022 23:16:25 +0800 Subject: [PATCH 4/6] Update .github/workflows/kvrocks.yaml Co-authored-by: tison --- .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 697de5b97c4..0249d331b86 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -34,7 +34,7 @@ jobs: matrix: os: [ubuntu-18.04] runs-on: ${{ matrix.os }} - needs: license # wait for license job + needs: [license] steps: - name: Checkout Code Base uses: actions/checkout@v2.3.4 From 862e8d0e5fd3259a897a7c10de2bb833f4c26a40 Mon Sep 17 00:00:00 2001 From: hulk Date: Mon, 9 May 2022 23:16:34 +0800 Subject: [PATCH 5/6] Update .github/workflows/kvrocks.yaml Co-authored-by: tison --- .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 0249d331b86..d2115fdc33a 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -84,7 +84,7 @@ jobs: matrix: os: [ubuntu-18.04] runs-on: ${{ matrix.os }} - needs: license # wait for license job + needs: [license] steps: - name: Checkout Code Base uses: actions/checkout@v2.3.4 From 950ce9b20b3149b1082225534c37d0da3ac530cf Mon Sep 17 00:00:00 2001 From: hulk Date: Mon, 9 May 2022 23:16:39 +0800 Subject: [PATCH 6/6] Update .github/workflows/kvrocks.yaml Co-authored-by: tison --- .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 d2115fdc33a..fc6a8455122 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -103,7 +103,7 @@ jobs: build-on-macos-latest: runs-on: macos-11 - needs: license # wait for license job + needs: [license] steps: - name: Checkout Code Base uses: actions/checkout@v2.3.4