Skip to content

chore[ci]: minor overhauls #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fizzyizzy05 merged 2 commits into from
Jul 27, 2026
Merged

chore[ci]: minor overhauls #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
142f6b1
chore[ci]: minor overhauls
fizzyizzy05 Jul 27, 2026
603823c
chore[ci]: flatten workflows folder
fizzyizzy05 Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-stable-lts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
24 changes: 3 additions & 21 deletions .github/workflows/build-bootc-image.yaml → .github/workflows/reusable-build-bootc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down