From 5c4d06fcf0eb3e9ed104d7e40cf4d8e9d7798413 Mon Sep 17 00:00:00 2001 From: Georgy Moiseev Date: Thu, 22 Dec 2022 12:45:31 +0300 Subject: [PATCH 1/3] ci: use testing rules in packing Use the same rules in packing as in testing to run on dev branches. Follows #248 --- .github/workflows/packing.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/packing.yml b/.github/workflows/packing.yml index d76a48ef..778f8244 100644 --- a/.github/workflows/packing.yml +++ b/.github/workflows/packing.yml @@ -2,10 +2,6 @@ name: packing on: push: - branches: - - master - tags: - - '*' pull_request: pull_request_target: types: [labeled] From 4f6b96514a23e03c81863cbb695929fc39e6bca1 Mon Sep 17 00:00:00 2001 From: Georgy Moiseev Date: Thu, 22 Dec 2022 12:48:16 +0300 Subject: [PATCH 2/3] ci: fix crud install Set valid package manager for fedora. Fix using apt for docker: debian/ubuntu containers are sudoless. Follows #264 --- .github/workflows/packing.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/packing.yml b/.github/workflows/packing.yml index 778f8244..ce0799bc 100644 --- a/.github/workflows/packing.yml +++ b/.github/workflows/packing.yml @@ -311,7 +311,8 @@ jobs: uses: actions/checkout@v3 - name: Setup Python and test running tools - run: dnf install -y python3 python3-libs python3-pip git make + # cmake rocks fail to install as expected without findutils + run: dnf install -y python3 python3-libs python3-pip git make cmake gcc unzip findutils - name: Remove connector source code run: python3 .github/scripts/remove_source_code.py @@ -336,7 +337,7 @@ jobs: - name: Install the crud module for testing purposes run: | curl -L https://tarantool.io/release/2/installer.sh | bash - sudo apt install -y tt + sudo dnf install -y tt tt rocks install crud - name: Run tests @@ -503,7 +504,7 @@ jobs: - name: Install the crud module for testing purposes run: | curl -L https://tarantool.io/release/2/installer.sh | bash - sudo apt install -y tt + apt install -y tt tt rocks install crud - name: Run tests From 27c31eec4e617c79f8234fd70f0a492e8fe99bca Mon Sep 17 00:00:00 2001 From: Georgy Moiseev Date: Thu, 22 Dec 2022 13:01:47 +0300 Subject: [PATCH 3/3] ci: fixate OS versions deb packages built with Ubuntu 22.04 fails to install on Debian 10, 11. --- .github/workflows/packing.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/packing.yml b/.github/workflows/packing.yml index ce0799bc..00ef82ab 100644 --- a/.github/workflows/packing.yml +++ b/.github/workflows/packing.yml @@ -16,7 +16,7 @@ jobs: if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -61,7 +61,7 @@ jobs: if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -116,7 +116,7 @@ jobs: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: windows-latest + runs-on: windows-2022 strategy: fail-fast: false @@ -184,7 +184,7 @@ jobs: - run_tests_pip_package_linux - run_tests_pip_package_windows - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -222,7 +222,7 @@ jobs: if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: image: ${{ matrix.target.os }}:${{ matrix.target.dist }} @@ -289,7 +289,7 @@ jobs: if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: image: ${{ matrix.target.os }}:${{ matrix.target.dist }} @@ -311,7 +311,8 @@ jobs: uses: actions/checkout@v3 - name: Setup Python and test running tools - # cmake rocks fail to install as expected without findutils + # cmake rocks fail to install as expected without findutils: + # https://github.com/tarantool/luarocks/issues/14 run: dnf install -y python3 python3-libs python3-pip git make cmake gcc unzip findutils - name: Remove connector source code @@ -349,7 +350,7 @@ jobs: needs: - run_tests_rpm - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -399,7 +400,7 @@ jobs: if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -447,7 +448,7 @@ jobs: if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: image: ${{ matrix.target.os }}:${{ matrix.target.dist }} @@ -516,7 +517,7 @@ jobs: needs: - run_tests_deb - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false