From 5221c20e0c3e2ff55e24090ec9a1ae0fcd762560 Mon Sep 17 00:00:00 2001 From: Georgy Moiseev Date: Thu, 28 Dec 2023 19:13:05 +0300 Subject: [PATCH] ci: test with 3.0 --- .github/workflows/test_on_push.yaml | 70 +++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index c4ada396..cc11b7b7 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -41,8 +41,7 @@ jobs: - tarantool-version: "2.11" external-merger-version: "0.0.5" external-keydef-version: "0.0.4" - - tarantool-version: "master" - metrics-version: "1.0.0" + - tarantool-version: "3.0.0" vshard-version: "0.1.25" fail-fast: false # Can't install older versions on 22.04, @@ -51,8 +50,8 @@ jobs: steps: - uses: actions/checkout@master - - name: Setup Tarantool CE - if: matrix.tarantool-version != 'master' + - name: Setup Tarantool CE (1.x, 2.x) + if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }} uses: tarantool/setup-tarantool@v2 with: tarantool-version: ${{ matrix.tarantool-version }} @@ -63,6 +62,24 @@ jobs: sudo apt install -y tt tt version + - name: Cache Tarantool 3.x + if: ${{ startsWith( matrix.tarantool-version, '3.' ) }} + id: cache-v3 + uses: actions/cache@v3 + with: + path: "${GITHUB_WORKSPACE}/bin" + key: cache-${{ matrix.tarantool-version }} + + - name: Setup Tarantool CE (3.x) + if: ${{ startsWith( matrix.tarantool-version, '3.' ) && steps.cache-latest.outputs.cache-hit != 'true' }} + run: | + tt init + tt install tarantool ${{ matrix.tarantool-version }} + + - name: Add Tarantool 3.x to PATH + if: matrix.tarantool-version == 'master' + run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH + - name: Get Tarantool master latest commit if: matrix.tarantool-version == 'master' run: | @@ -78,14 +95,14 @@ jobs: path: "${GITHUB_WORKSPACE}/bin" key: cache-latest-${{ env.LATEST_COMMIT }} - - name: Setup Tarantool master + - name: Setup Tarantool CE (master) if: matrix.tarantool-version == 'master' && steps.cache-latest.outputs.cache-hit != 'true' run: | tt init tt install tarantool master - - name: Add Tarantool master to PATH - if: matrix.tarantool-version == 'master' + - name: Add tt Tarantool to PATH + if: ${{ startsWith( matrix.tarantool-version, '3.' ) || matrix.tarantool-version == 'master' }} run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH - name: Fix luarocks in Tarantool CE 1.10.6 @@ -139,16 +156,15 @@ jobs: metrics-version: ["1.0.0"] cartridge-version: ["2.8.0"] include: - - tarantool-version: "master" - metrics-version: "1.0.0" + - tarantool-version: "3.0.0" vshard-version: "0.1.25" fail-fast: false runs-on: ubuntu-20.04 steps: - uses: actions/checkout@master - - name: Setup Tarantool CE - if: matrix.tarantool-version != 'master' + - name: Setup Tarantool CE (1.x, 2.x) + if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }} uses: tarantool/setup-tarantool@v2 with: tarantool-version: ${{ matrix.tarantool-version }} @@ -159,6 +175,24 @@ jobs: sudo apt install -y tt tt version + - name: Cache Tarantool 3.x + if: ${{ startsWith( matrix.tarantool-version, '3.' ) }} + id: cache-v3 + uses: actions/cache@v3 + with: + path: "${GITHUB_WORKSPACE}/bin" + key: cache-${{ matrix.tarantool-version }} + + - name: Setup Tarantool CE (3.x) + if: ${{ startsWith( matrix.tarantool-version, '3.' ) && steps.cache-latest.outputs.cache-hit != 'true' }} + run: | + tt init + tt install tarantool ${{ matrix.tarantool-version }} + + - name: Add Tarantool 3.x to PATH + if: matrix.tarantool-version == 'master' + run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH + - name: Get Tarantool master latest commit if: matrix.tarantool-version == 'master' run: | @@ -174,14 +208,14 @@ jobs: path: "${GITHUB_WORKSPACE}/bin" key: cache-latest-${{ env.LATEST_COMMIT }} - - name: Setup Tarantool master + - name: Setup Tarantool CE (master) if: matrix.tarantool-version == 'master' && steps.cache-latest.outputs.cache-hit != 'true' run: | tt init tt install tarantool master - - name: Add Tarantool master to PATH - if: matrix.tarantool-version == 'master' + - name: Add tt Tarantool to PATH + if: ${{ startsWith( matrix.tarantool-version, '3.' ) || matrix.tarantool-version == 'master' }} run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH - name: Install requirements for community @@ -214,8 +248,16 @@ jobs: bundle: "tarantool-enterprise-sdk-1.10.15-0-r563" - folder: "2.11" bundle: "tarantool-enterprise-sdk-nogc64-2.11.0-0-r563.linux.x86_64" + - folder: "3.0" + bundle: "tarantool-enterprise-sdk-gc64-3.0.0-0-gf58f7d82a-r23.linux.x86_64" metrics-version: ["", "1.0.0"] cartridge-version: ["2.8.0"] + include: + - tarantool-version: + folder: "3.0" + bundle: "tarantool-enterprise-sdk-gc64-3.0.0-0-gf58f7d82a-r23.linux.x86_64" + vshard-version: "0.1.25" + fail-fast: false runs-on: ubuntu-20.04 steps: