From arbab at linux.ibm.com Thu Jun 12 01:03:29 2025 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 11 Jun 2025 10:03:29 -0500 Subject: [Skiboot] [PATCH 2/2] opal-ci: Drop ubuntu-20.04, add ubuntu-24.04 In-Reply-To: <20250611150329.281319-1-arbab@linux.ibm.com> References: <20250611150329.281319-1-arbab@linux.ibm.com> Message-ID: <20250611150329.281319-2-arbab@linux.ibm.com> Standard support for Ubuntu 20.04 ended on May 31, 2025. Remove it and add Ubuntu 24.04. Signed-off-by: Reza Arbab --- .github/workflows/docker-builds-checks.yml | 2 +- opal-ci/{Dockerfile-ubuntu-20.04 => Dockerfile-ubuntu-24.04} | 4 ++-- opal-ci/{build-ubuntu-20.04.sh => build-ubuntu-24.04.sh} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename opal-ci/{Dockerfile-ubuntu-20.04 => Dockerfile-ubuntu-24.04} (79%) rename opal-ci/{build-ubuntu-20.04.sh => build-ubuntu-24.04.sh} (94%) diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index 3a26df158f61..22fdbc802779 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-20.04, ubuntu-22.04, ubuntu-rolling, fedora41, fedora42, fedora-rawhide, docs ] + os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-rolling, fedora41, fedora42, fedora-rawhide, docs ] steps: - uses: actions/checkout at v4 diff --git a/opal-ci/Dockerfile-ubuntu-20.04 b/opal-ci/Dockerfile-ubuntu-24.04 similarity index 79% rename from opal-ci/Dockerfile-ubuntu-20.04 rename to opal-ci/Dockerfile-ubuntu-24.04 index 8333b12180a7..18d4d83bdd7d 100644 --- a/opal-ci/Dockerfile-ubuntu-20.04 +++ b/opal-ci/Dockerfile-ubuntu-24.04 @@ -1,9 +1,9 @@ -FROM ubuntu:20.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -qq RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi RUN apt-get install -y gcc-arm-linux-gnueabi || true -RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev +RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python3 g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi COPY . /build/ diff --git a/opal-ci/build-ubuntu-20.04.sh b/opal-ci/build-ubuntu-24.04.sh similarity index 94% rename from opal-ci/build-ubuntu-20.04.sh rename to opal-ci/build-ubuntu-24.04.sh index 48eb825bf40b..ba070b4be38e 100755 --- a/opal-ci/build-ubuntu-20.04.sh +++ b/opal-ci/build-ubuntu-24.04.sh @@ -4,7 +4,7 @@ set -uo pipefail set -e set -vx -MAKE_J=$(grep -c processor /proc/cpuinfo) +MAKE_J=$(nproc) export CROSS="ccache powerpc64le-linux-gnu-" -- 2.43.5 From arbab at linux.ibm.com Thu Jun 12 01:03:28 2025 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 11 Jun 2025 10:03:28 -0500 Subject: [Skiboot] [PATCH 1/2] opal-ci: Drop fedora40, add fedora42 Message-ID: <20250611150329.281319-1-arbab@linux.ibm.com> Fedora 40 has reached end-of-life. Remove it and add Fedora 42. Signed-off-by: Reza Arbab --- .github/workflows/docker-builds-checks.yml | 2 +- opal-ci/Dockerfile-docs | 2 +- opal-ci/{Dockerfile-fedora40 => Dockerfile-fedora42} | 2 +- opal-ci/{build-fedora40.sh => build-fedora42.sh} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename opal-ci/{Dockerfile-fedora40 => Dockerfile-fedora42} (94%) rename opal-ci/{build-fedora40.sh => build-fedora42.sh} (100%) diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index e80f27b2b618..3a26df158f61 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-20.04, ubuntu-22.04, ubuntu-rolling, fedora40, fedora41, fedora-rawhide, docs ] + os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, fedora41, fedora42, fedora-rawhide, docs ] steps: - uses: actions/checkout at v4 diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs index 90ccf0965505..e6a1ba5dc1cf 120000 --- a/opal-ci/Dockerfile-docs +++ b/opal-ci/Dockerfile-docs @@ -1 +1 @@ -Dockerfile-fedora40 \ No newline at end of file +Dockerfile-fedora41 \ No newline at end of file diff --git a/opal-ci/Dockerfile-fedora40 b/opal-ci/Dockerfile-fedora42 similarity index 94% rename from opal-ci/Dockerfile-fedora40 rename to opal-ci/Dockerfile-fedora42 index efd43a7dba20..9c4e581ba13d 100644 --- a/opal-ci/Dockerfile-fedora40 +++ b/opal-ci/Dockerfile-fedora42 @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:42 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 which qemu-system-ppc # for building documentation and the coverage report diff --git a/opal-ci/build-fedora40.sh b/opal-ci/build-fedora42.sh similarity index 100% rename from opal-ci/build-fedora40.sh rename to opal-ci/build-fedora42.sh -- 2.43.5 From dan at danny.cz Thu Jun 12 01:39:45 2025 From: dan at danny.cz (Dan =?UTF-8?B?SG9yw6Fr?=) Date: Wed, 11 Jun 2025 17:39:45 +0200 Subject: [Skiboot] [PATCH 1/2] opal-ci: Drop fedora40, add fedora42 In-Reply-To: <20250611150329.281319-1-arbab@linux.ibm.com> References: <20250611150329.281319-1-arbab@linux.ibm.com> Message-ID: <20250611173945.8822c621d59ca4f22c062cd0@danny.cz> On Wed, 11 Jun 2025 10:03:28 -0500 Reza Arbab wrote: > Fedora 40 has reached end-of-life. Remove it and add Fedora 42. > > Signed-off-by: Reza Arbab LGTM Reviewed-by: Dan Hor?k Dan > --- > .github/workflows/docker-builds-checks.yml | 2 +- > opal-ci/Dockerfile-docs | 2 +- > opal-ci/{Dockerfile-fedora40 => Dockerfile-fedora42} | 2 +- > opal-ci/{build-fedora40.sh => build-fedora42.sh} | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename opal-ci/{Dockerfile-fedora40 => Dockerfile-fedora42} (94%) > rename opal-ci/{build-fedora40.sh => build-fedora42.sh} (100%) > > diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml > index e80f27b2b618..3a26df158f61 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-20.04, ubuntu-22.04, ubuntu-rolling, fedora40, fedora41, fedora-rawhide, docs ] > + os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, fedora41, fedora42, fedora-rawhide, docs ] > > steps: > - uses: actions/checkout at v4 > diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs > index 90ccf0965505..e6a1ba5dc1cf 120000 > --- a/opal-ci/Dockerfile-docs > +++ b/opal-ci/Dockerfile-docs > @@ -1 +1 @@ > -Dockerfile-fedora40 > \ No newline at end of file > +Dockerfile-fedora41 > \ No newline at end of file > diff --git a/opal-ci/Dockerfile-fedora40 b/opal-ci/Dockerfile-fedora42 > similarity index 94% > rename from opal-ci/Dockerfile-fedora40 > rename to opal-ci/Dockerfile-fedora42 > index efd43a7dba20..9c4e581ba13d 100644 > --- a/opal-ci/Dockerfile-fedora40 > +++ b/opal-ci/Dockerfile-fedora42 > @@ -1,4 +1,4 @@ > -FROM registry.fedoraproject.org/fedora:40 > +FROM registry.fedoraproject.org/fedora:42 > 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 which qemu-system-ppc > # for building documentation and the coverage report > diff --git a/opal-ci/build-fedora40.sh b/opal-ci/build-fedora42.sh > similarity index 100% > rename from opal-ci/build-fedora40.sh > rename to opal-ci/build-fedora42.sh > -- > 2.43.5 > > _______________________________________________ > Skiboot mailing list > Skiboot at lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot