From 142f6b16887e7757dccf7bb24977538cd949b3da Mon Sep 17 00:00:00 2001 From: Izzy Date: Mon, 27 Jul 2026 18:30:35 +0100 Subject: [PATCH 1/2] chore[ci]: minor overhauls --- .github/workflows/build-latest.yml | 4 ++-- .github/workflows/build-stable-lts.yaml | 4 ++-- .github/workflows/build-stable.yaml | 4 ++-- .../build-bootc.yaml} | 24 +++---------------- 4 files changed, 9 insertions(+), 27 deletions(-) rename .github/workflows/{build-bootc-image.yaml => reusable/build-bootc.yaml} (92%) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 5688bbd..2b6f2d1 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -22,7 +22,7 @@ permissions: jobs: apollo: name: apollo - uses: ./.github/workflows/build-bootc-image.yaml + uses: ./.github/workflows/reusable/build-bootc.yaml with: image-name: "apollo" image-tag: "latest" @@ -31,7 +31,7 @@ jobs: apollo-nvidia: name: apollo-nvidia - uses: ./.github/workflows/build-bootc-image.yaml + uses: ./.github/workflows/reusable/build-bootc.yaml with: image-name: "apollo-nvidia" image-tag: "latest" diff --git a/.github/workflows/build-stable-lts.yaml b/.github/workflows/build-stable-lts.yaml index 9054fef..fe34e16 100644 --- a/.github/workflows/build-stable-lts.yaml +++ b/.github/workflows/build-stable-lts.yaml @@ -14,7 +14,7 @@ permissions: jobs: apollo: name: apollo - uses: ./.github/workflows/build-bootc-image.yaml + uses: ./.github/workflows/reusable/build-bootc.yaml with: image-name: "apollo" image-tag: "stable-lts" @@ -23,7 +23,7 @@ jobs: apollo-nvidia: name: apollo-nvidia - uses: ./.github/workflows/build-bootc-image.yaml + uses: ./.github/workflows/reusable/build-bootc.yaml with: image-name: "apollo-nvidia" image-tag: "stable-lts" diff --git a/.github/workflows/build-stable.yaml b/.github/workflows/build-stable.yaml index e496f09..dd84397 100644 --- a/.github/workflows/build-stable.yaml +++ b/.github/workflows/build-stable.yaml @@ -14,7 +14,7 @@ permissions: jobs: apollo: name: apollo - uses: ./.github/workflows/build-bootc-image.yaml + uses: ./.github/workflows/reusable/build-bootc.yaml with: image-name: "apollo" image-tag: "stable" @@ -23,7 +23,7 @@ jobs: apollo-nvidia: name: apollo-nvidia - uses: ./.github/workflows/build-bootc-image.yaml + uses: ./.github/workflows/reusable/build-bootc.yaml with: image-name: "apollo-nvidia" image-tag: "stable" diff --git a/.github/workflows/build-bootc-image.yaml b/.github/workflows/reusable/build-bootc.yaml similarity index 92% rename from .github/workflows/build-bootc-image.yaml rename to .github/workflows/reusable/build-bootc.yaml index f80b935..aa96d9a 100644 --- a/.github/workflows/build-bootc-image.yaml +++ b/.github/workflows/reusable/build-bootc.yaml @@ -59,7 +59,7 @@ jobs: timeout-minutes: 60 strategy: fail-fast: false - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 outputs: image_version: ${{ steps.getversion.outputs.image_version }} steps: @@ -75,26 +75,8 @@ jobs: with: submodules: true - # We need newer podman due to old podman not supporting lots of flags - - name: Update podman and install just - shell: bash - run: | - set -eux - # Require the runner is ubuntu-24.04 - IDV=$(. /usr/lib/os-release && echo ${ID}-${VERSION_ID}) - test "${IDV}" = "ubuntu-24.04" - # resolute is the next release. The azure.archive.ubuntu.com mirror only carries amd64. - # Other architectures like arm64 use ports.ubuntu.com/ubuntu-ports. - if [ "$(dpkg --print-architecture)" = "amd64" ]; then - mirror="http://azure.archive.ubuntu.com/ubuntu" - else - mirror="http://ports.ubuntu.com/ubuntu-ports" - fi - echo "deb ${mirror} resolute universe main" | sudo tee /etc/apt/sources.list.d/resolute.list - /bin/time -f '%E %C' sudo apt update - # skopeo is currently older in resolute for some reason hence --allow-downgrades - /bin/time -f '%E %C' sudo apt install -y --allow-downgrades crun/resolute buildah/resolute podman/resolute skopeo/resolute just/resolute - podman --version + - name: Install Just + uses: extractions/setup-just@v4 - name: Install mkosi uses: systemd/mkosi@c4c3d793d0f6f0a2f26895de5ed9382396f36bb5 From 603823c658c2ee0a905b84f2962091ea31dd8ef8 Mon Sep 17 00:00:00 2001 From: Izzy Date: Mon, 27 Jul 2026 18:32:05 +0100 Subject: [PATCH 2/2] chore[ci]: flatten workflows folder --- .github/workflows/build-latest.yml | 4 ++-- .github/workflows/build-stable-lts.yaml | 4 ++-- .github/workflows/build-stable.yaml | 4 ++-- .../{reusable/build-bootc.yaml => reusable-build-bootc.yaml} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{reusable/build-bootc.yaml => reusable-build-bootc.yaml} (100%) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 2b6f2d1..0538d62 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -22,7 +22,7 @@ permissions: jobs: apollo: name: apollo - uses: ./.github/workflows/reusable/build-bootc.yaml + uses: ./.github/workflows/reusable-build-bootc.yaml with: image-name: "apollo" image-tag: "latest" @@ -31,7 +31,7 @@ jobs: apollo-nvidia: name: apollo-nvidia - uses: ./.github/workflows/reusable/build-bootc.yaml + uses: ./.github/workflows/reusable-build-bootc.yaml with: image-name: "apollo-nvidia" image-tag: "latest" diff --git a/.github/workflows/build-stable-lts.yaml b/.github/workflows/build-stable-lts.yaml index fe34e16..acf9201 100644 --- a/.github/workflows/build-stable-lts.yaml +++ b/.github/workflows/build-stable-lts.yaml @@ -14,7 +14,7 @@ permissions: jobs: apollo: name: apollo - uses: ./.github/workflows/reusable/build-bootc.yaml + uses: ./.github/workflows/reusable-build-bootc.yaml with: image-name: "apollo" image-tag: "stable-lts" @@ -23,7 +23,7 @@ jobs: apollo-nvidia: name: apollo-nvidia - uses: ./.github/workflows/reusable/build-bootc.yaml + uses: ./.github/workflows/reusable-build-bootc.yaml with: image-name: "apollo-nvidia" image-tag: "stable-lts" diff --git a/.github/workflows/build-stable.yaml b/.github/workflows/build-stable.yaml index dd84397..bbc8842 100644 --- a/.github/workflows/build-stable.yaml +++ b/.github/workflows/build-stable.yaml @@ -14,7 +14,7 @@ permissions: jobs: apollo: name: apollo - uses: ./.github/workflows/reusable/build-bootc.yaml + uses: ./.github/workflows/reusable-build-bootc.yaml with: image-name: "apollo" image-tag: "stable" @@ -23,7 +23,7 @@ jobs: apollo-nvidia: name: apollo-nvidia - uses: ./.github/workflows/reusable/build-bootc.yaml + uses: ./.github/workflows/reusable-build-bootc.yaml with: image-name: "apollo-nvidia" image-tag: "stable" diff --git a/.github/workflows/reusable/build-bootc.yaml b/.github/workflows/reusable-build-bootc.yaml similarity index 100% rename from .github/workflows/reusable/build-bootc.yaml rename to .github/workflows/reusable-build-bootc.yaml