diff options
| author | Reza Arbab <arbab@linux.ibm.com> | 2022-06-07 15:44:11 -0500 |
|---|---|---|
| committer | Reza Arbab <arbab@linux.ibm.com> | 2022-06-13 08:20:58 -0500 |
| commit | 5133e1efc9470781fb5ccf553460ecb8b3dccbc7 (patch) | |
| tree | 9573dc541ccdf84e49233a52285ff14f60175063 | |
| parent | adf868c64ba7a86b64f45218cf4ca29c3f29f9d1 (diff) | |
| download | skiboot-5133e1efc9470781fb5ccf553460ecb8b3dccbc7.zip skiboot-5133e1efc9470781fb5ccf553460ecb8b3dccbc7.tar.gz skiboot-5133e1efc9470781fb5ccf553460ecb8b3dccbc7.tar.bz2 | |
opal-ci: Drop fedora34, add fedora36
Fedora 34 has reached end-of-life. Remove it and add Fedora 36.
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Dan Horák <dan@danny.cz>
| -rw-r--r-- | .github/workflows/docker-builds-checks.yml | 2 | ||||
| l--------- | opal-ci/Dockerfile-docs | 2 | ||||
| -rw-r--r-- | opal-ci/Dockerfile-fedora36 (renamed from opal-ci/Dockerfile-fedora34) | 5 | ||||
| -rwxr-xr-x | opal-ci/build-fedora36.sh (renamed from opal-ci/build-fedora34.sh) | 0 |
4 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index 651bcb8..e6285d0 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-22.04, ubuntu-rolling, centos7, fedora34, fedora35, fedora-rawhide, docs ] + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, centos7, fedora35, fedora36, fedora-rawhide, docs ] steps: - uses: actions/checkout@v2 diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs index f96a5e1..24238a7 120000 --- a/opal-ci/Dockerfile-docs +++ b/opal-ci/Dockerfile-docs @@ -1 +1 @@ -Dockerfile-fedora34
\ No newline at end of file +Dockerfile-fedora35
\ No newline at end of file diff --git a/opal-ci/Dockerfile-fedora34 b/opal-ci/Dockerfile-fedora36 index 6cc1241..af187f0 100644 --- a/opal-ci/Dockerfile-fedora34 +++ b/opal-ci/Dockerfile-fedora36 @@ -1,9 +1,10 @@ -FROM fedora:34 +FROM fedora:36 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 +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 which qemu-system-ppc # 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 +RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr diff --git a/opal-ci/build-fedora34.sh b/opal-ci/build-fedora36.sh index 7c607a1..7c607a1 100755 --- a/opal-ci/build-fedora34.sh +++ b/opal-ci/build-fedora36.sh |