From ce1dc987566a155c21648cd7bc374ec8016f72a7 Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Thu, 20 Jul 2023 13:57:44 -0400 Subject: [PATCH] common: drop Debian and Fedora from CI - includes a small revamp of the docker rebuild matrix Signed-off-by: Jan Michalski --- .github/workflows/docker_rebuild.yml | 22 ++++++++++------------ .github/workflows/nightly.yml | 4 ---- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker_rebuild.yml b/.github/workflows/docker_rebuild.yml index e7b363443f0..6d0444f2d75 100644 --- a/.github/workflows/docker_rebuild.yml +++ b/.github/workflows/docker_rebuild.yml @@ -30,19 +30,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - CONFIG: [ - "OS=centos OS_VER=7", - "OS=centos OS_VER=stream", - "OS=debian OS_VER=11", - "OS=fedora OS_VER=37", - "OS=opensuse-leap OS_VER=15", - "OS=rockylinux OS_VER=8", - "OS=rockylinux OS_VER=9", - "OS=ubuntu OS_VER=22.04", - ] + include: + - {OS: opensuse-leap, OS_VER: 15} + - {OS: rockylinux, OS_VER: 8} + - {OS: rockylinux, OS_VER: 9} + - {OS: ubuntu, OS_VER: 22.04} steps: - name: Clone the git repo uses: actions/checkout@v3 - - name: Pull or rebuild the image - run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh rebuild + - name: Rebuild the image + env: + OS: ${{ matrix.OS }} + OS_VER: ${{ matrix.OS_VER }} + run: cd $WORKDIR && ./pull-or-rebuild-image.sh rebuild diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fa499eed45d..4cce0355128 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -30,8 +30,6 @@ jobs: CONFIG: [ "OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n", "OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMDK_CC=clang PMDK_CXX=clang++", - "OS=debian OS_VER=11 FAULT_INJECTION=1 TEST_BUILD=debug", - "OS=debian OS_VER=11 FAULT_INJECTION=1 TEST_BUILD=nondebug", "OS=opensuse-leap OS_VER=15 FAULT_INJECTION=1 TEST_BUILD=debug", "OS=opensuse-leap OS_VER=15 FAULT_INJECTION=1 TEST_BUILD=nondebug", "OS=opensuse-leap OS_VER=15 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0", @@ -41,8 +39,6 @@ jobs: "OS=rockylinux OS_VER=9 TEST_BUILD=debug", "OS=rockylinux OS_VER=9 TEST_BUILD=nondebug", "OS=rockylinux OS_VER=9 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0", - "OS=fedora OS_VER=37 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=debug", - "OS=fedora OS_VER=37 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug", ] steps: - name: Clone the git repo