Message ID | 20220307145920.30432-1-dan@danny.cz |
---|---|
State | Accepted |
Headers | show |
Series | ci: remove Fedora 33 | expand |
On Mon, 7 Mar 2022 15:59:20 +0100 Dan Horák <dan@danny.cz> wrote: > Fedora 33 has been EOL since the end of 2021, so remove it from the CI > setup. this has been rebased on Joel's changes to avoid the merge conflict Dan > Signed-off-by: Dan Horák <dan@danny.cz> > --- > .github/workflows/docker-builds-checks.yml | 2 +- > opal-ci/Dockerfile-fedora33 | 9 --------- > opal-ci/build-fedora33.sh | 22 ---------------------- > 3 files changed, 1 insertion(+), 32 deletions(-) > delete mode 100644 opal-ci/Dockerfile-fedora33 > delete mode 100755 opal-ci/build-fedora33.sh > > diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml > index 2e665b1f..a9878fd5 100644 > --- a/.github/workflows/docker-builds-checks.yml > +++ b/.github/workflows/docker-builds-checks.yml > @@ -12,7 +12,7 @@ jobs: > fail-fast: false > > matrix: > - os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-rolling, centos7, fedora33, fedora34, fedora35, docs ] > + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-rolling, centos7, fedora34, fedora35, docs ] > > steps: > - uses: actions/checkout@v2 > diff --git a/opal-ci/Dockerfile-fedora33 b/opal-ci/Dockerfile-fedora33 > deleted file mode 100644 > index cbe32fa3..00000000 > --- a/opal-ci/Dockerfile-fedora33 > +++ /dev/null > @@ -1,9 +0,0 @@ > -FROM fedora:33 > -RUN dnf -y update > -RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel > -# for building documentation and the coverage report > -RUN dnf -y install python-pip lcov > -RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi > -RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi > -COPY . /build/ > -WORKDIR /build > diff --git a/opal-ci/build-fedora33.sh b/opal-ci/build-fedora33.sh > deleted file mode 100755 > index 9042256d..00000000 > --- a/opal-ci/build-fedora33.sh > +++ /dev/null > @@ -1,22 +0,0 @@ > -#!/bin/bash > - > -set -uo pipefail > -set -e > -set -vx > - > -MAKE_J=$(grep -c processor /proc/cpuinfo) > -export CROSS="ccache powerpc64-linux-gnu-" > - > -make -j${MAKE_J} all > -make -j${MAKE_J} check > -(make clean; cd external/gard && CROSS= make -j${MAKE_J}) > -(cd external/pflash; make -j${MAKE_J}) > -make clean > -SKIBOOT_GCOV=1 make -j${MAKE_J} > -SKIBOOT_GCOV=1 make -j${MAKE_J} check > - > -make clean > -rm -rf builddir > -mkdir builddir > -make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J} > -make clean > -- > 2.34.1 > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index 2e665b1f..a9878fd5 100644 --- a/.github/workflows/docker-builds-checks.yml +++ b/.github/workflows/docker-builds-checks.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: - os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-rolling, centos7, fedora33, fedora34, fedora35, docs ] + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-rolling, centos7, fedora34, fedora35, docs ] steps: - uses: actions/checkout@v2 diff --git a/opal-ci/Dockerfile-fedora33 b/opal-ci/Dockerfile-fedora33 deleted file mode 100644 index cbe32fa3..00000000 --- a/opal-ci/Dockerfile-fedora33 +++ /dev/null @@ -1,9 +0,0 @@ -FROM fedora:33 -RUN dnf -y update -RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel -# for building documentation and the coverage report -RUN dnf -y install python-pip lcov -RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi -RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi -COPY . /build/ -WORKDIR /build diff --git a/opal-ci/build-fedora33.sh b/opal-ci/build-fedora33.sh deleted file mode 100755 index 9042256d..00000000 --- a/opal-ci/build-fedora33.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -uo pipefail -set -e -set -vx - -MAKE_J=$(grep -c processor /proc/cpuinfo) -export CROSS="ccache powerpc64-linux-gnu-" - -make -j${MAKE_J} all -make -j${MAKE_J} check -(make clean; cd external/gard && CROSS= make -j${MAKE_J}) -(cd external/pflash; make -j${MAKE_J}) -make clean -SKIBOOT_GCOV=1 make -j${MAKE_J} -SKIBOOT_GCOV=1 make -j${MAKE_J} check - -make clean -rm -rf builddir -mkdir builddir -make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J} -make clean
Fedora 33 has been EOL since the end of 2021, so remove it from the CI setup. Signed-off-by: Dan Horák <dan@danny.cz> --- .github/workflows/docker-builds-checks.yml | 2 +- opal-ci/Dockerfile-fedora33 | 9 --------- opal-ci/build-fedora33.sh | 22 ---------------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 opal-ci/Dockerfile-fedora33 delete mode 100755 opal-ci/build-fedora33.sh