From eabd8ebf206e8fe864691c74ceebaaa2ed6ec24b Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Thu, 7 Nov 2024 07:56:41 +0100 Subject: [PATCH 1/2] Bump Fedora images Signed-off-by: Martin Styk --- .github/workflows/review-checks.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/review-checks.yml b/.github/workflows/review-checks.yml index 13d03e6..5d25eb0 100644 --- a/.github/workflows/review-checks.yml +++ b/.github/workflows/review-checks.yml @@ -8,16 +8,15 @@ jobs: fail-fast: false matrix: image: - - quay.io/fedora/fedora:38 - - quay.io/fedora/fedora:39 - quay.io/fedora/fedora:40 + - quay.io/fedora/fedora:41 - quay.io/fedora/fedora:rawhide runs-on: ubuntu-latest container: image: ${{ matrix.image }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set DNF command run: | if [[ "${{ matrix.image }}" == *"rawhide"* ]]; then @@ -38,7 +37,7 @@ jobs: set -o pipefail make check | tee unittests.out mv unittests.out /__w/unittests.out - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: unittests.out path: /home/runner/work/unittests.out @@ -48,16 +47,15 @@ jobs: fail-fast: false matrix: image: - - quay.io/fedora/fedora:38 - - quay.io/fedora/fedora:39 - quay.io/fedora/fedora:40 + - quay.io/fedora/fedora:41 - quay.io/fedora/fedora:rawhide runs-on: ubuntu-latest container: image: ${{ matrix.image }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set DNF command run: | if [[ "${{ matrix.image }}" == *"rawhide"* ]]; then @@ -78,7 +76,7 @@ jobs: set -o pipefail make valgrind 2>&1 | tee valgrind.out mv valgrind.out /__w/valgrind.out - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: valgrind.out path: /home/runner/work/valgrind.out @@ -89,8 +87,6 @@ jobs: fail-fast: false matrix: image: - - quay.io/fedora/fedora:38 - - quay.io/fedora/fedora:39 - quay.io/fedora/fedora:40 - quay.io/fedora/fedora:rawhide - quay.io/centos/centos:centos7 From 22d2a5343acc54c2eb57605ff88cf73f8f914f01 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Thu, 7 Nov 2024 08:07:01 +0100 Subject: [PATCH 2/2] Clean-up CentOS images Signed-off-by: Martin Styk --- .github/workflows/review-checks.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/review-checks.yml b/.github/workflows/review-checks.yml index 5d25eb0..3325032 100644 --- a/.github/workflows/review-checks.yml +++ b/.github/workflows/review-checks.yml @@ -89,7 +89,6 @@ jobs: image: - quay.io/fedora/fedora:40 - quay.io/fedora/fedora:rawhide - - quay.io/centos/centos:centos7 container: image: ${{ matrix.image }} @@ -103,19 +102,9 @@ jobs: echo "DNF_COMMAND=dnf" >> $GITHUB_ENV echo "BUILDDEP_SPEC_ARG=--spec" >> $GITHUB_ENV fi - - name: Enable EPEL - run: | - yum install -y epel-release - if: contains(matrix.image, 'centos') - name: Install Git client (Fedora) run: | ${{ env.DNF_COMMAND }} install -y git - if: contains(matrix.image, 'fedora') - - name: Install Git client (CentOS) - run: | - yum install -y https://repo.ius.io/ius-release-el7.rpm - yum install -y git236-core - if: contains(matrix.image, 'centos7') - uses: actions/checkout@v3 - name: Install deps run: | @@ -135,7 +124,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["8", "9"] + version: ["9", "10-development"] container: image: quay.io/centos/centos:stream${{ matrix.version }} options: --security-opt seccomp=unconfined @@ -151,10 +140,6 @@ jobs: - name: Install deps run: | yum install -y ${{ env.DNF_COMMAND }} 'dnf-command(builddep)' tito - - name: Enable PowerTools - run: | - yum config-manager --set-enabled powertools - if: contains(matrix.version, '8') - name: Enable CRB run: | yum config-manager --set-enabled crb