diff options
| -rw-r--r-- | .github/workflows/build-and-run.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/run-tests-bigendian.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/run-tests.yml | 10 |
3 files changed, 12 insertions, 17 deletions
diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml index 9caf31cf..67c688d8 100644 --- a/.github/workflows/build-and-run.yml +++ b/.github/workflows/build-and-run.yml @@ -20,6 +20,9 @@ jobs: - distro: ubuntu-24.04 pkg-distro: ubuntu24.04 cpack-type: Ubuntu24 + - distro: ubuntu-26.04 + pkg-distro: ubuntu26.04 + cpack-type: Ubuntu24 runs-on: ${{ matrix.distro }} steps: - name: Set common vars @@ -83,12 +86,12 @@ jobs: matrix: distro: [ - "debian:11", "debian:12", "debian:13", "debian:forky", "ubuntu:22.04", "ubuntu:24.04", + "ubuntu:26.04", "ubuntu:devel" ] runs-on: ubuntu-24.04 @@ -103,8 +106,8 @@ jobs: debian:forky) DISTRO=debian13; CPACK_TYPE=Debian13 ;; debian:13) DISTRO=debian13; CPACK_TYPE=Debian13 ;; debian:12) DISTRO=debian12; CPACK_TYPE=Debian12 ;; - debian:11) CPACK_TYPE=Debian11 ;; ubuntu:devel) CPACK_TYPE=Ubuntu24 ; HEADERS_SUFFIX=generic ;; + ubuntu:26.04) CPACK_TYPE=Ubuntu24 ; HEADERS_SUFFIX=generic ;; ubuntu:24.04) CPACK_TYPE=Ubuntu24 ; HEADERS_SUFFIX=generic ;; ubuntu:22.04) CPACK_TYPE=Ubuntu22 ; HEADERS_SUFFIX=generic ;; esac; diff --git a/.github/workflows/run-tests-bigendian.yml b/.github/workflows/run-tests-bigendian.yml index 6808900d..bce49c35 100644 --- a/.github/workflows/run-tests-bigendian.yml +++ b/.github/workflows/run-tests-bigendian.yml @@ -11,7 +11,7 @@ jobs: Test-in-Alpine-s390x: #if: ${{ false }} # disable for now - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 name: Test in Qemu (s390x Alpine) steps: @@ -26,15 +26,7 @@ jobs: NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install wget openssh-client screen libglib2.0-dev libfdt-dev libpixman-1-dev zlib1g-dev libslirp-dev ninja-build - - name: Build Qemu 9.1.2 - # Qemu 8.2 from Ubuntu24.04 has critical s390x-related bugs so Qemu9 is required - run: | - wget -nv https://github.com/qemu/qemu/archive/refs/tags/v9.1.2.tar.gz - tar -xf v9.1.2.tar.gz - cd qemu-9.1.2 - ./configure --target-list=s390x-softmmu --enable-slirp - make -j - sudo make install + qemu-system-s390x qemu-utils qemu-system-data - name: Prepare qemu files run: | ssh-keygen -t ed25519 -q -N "" -f ssh-key diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7ce55b6e..337e23df 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,6 +16,11 @@ jobs: fail-fast: false matrix: include: + - distro: Ubuntu-26.04 + image: https://cloud-images.ubuntu.com/resolute/current/resolute-server-cloudimg-amd64v3.img + untar: false + format: qcow2 + - distro: Ubuntu-24.04 image: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img untar: false @@ -36,11 +41,6 @@ jobs: untar: true format: raw - - distro: Debian11 - image: https://cdimage.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.tar.xz - untar: true - format: raw - steps: - name: Check out repository code uses: actions/checkout@v4 |