Skip to content

Commit 7ae681f

Browse files
authored
Merge pull request bootc-dev#671 from travier/ci-fixup
github/workflows: Update to ubuntu-24.04 & podman
2 parents f90b45e + e51f038 commit 7ae681f

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ env:
1919

2020
jobs:
2121
c9s-bootc-e2e:
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2323
steps:
24-
# We use docker to build because it updates to the latest, whereas right now ubuntu-latest
25-
# has podman and buildah from ~2021 (insane!)
26-
- name: Set up Docker Buildx
27-
uses: docker/setup-buildx-action@v3
2824
- uses: actions/checkout@v3
29-
- name: Cache Dependencies
30-
uses: Swatinem/rust-cache@v2
31-
with:
32-
key: "build-c9s"
33-
- name: Build and export to Docker
34-
uses: docker/build-push-action@v5
35-
with:
36-
context: .
37-
file: ci/Containerfile.c9s
38-
load: true
39-
tags: localhost/bootupd:latest
40-
- name: Copy to podman
41-
run: sudo skopeo copy docker-daemon:localhost/bootupd:latest containers-storage:localhost/bootupd:latest
25+
- name: build
26+
run: sudo podman build -t localhost/bootupd:latest -f ci/Containerfile.c9s .
4227
- name: bootc install to disk
4328
run: |
4429
set -xeuo pipefail
@@ -60,7 +45,7 @@ jobs:
6045
run: |
6146
set -xeuo pipefail
6247
sudo podman run --rm -ti --privileged -v /:/target --pid=host --security-opt label=disable \
63-
-v /var/lib/containers:/var/lib/containers \
48+
-v /dev:/dev -v /var/lib/containers:/var/lib/containers \
6449
localhost/bootupd:latest bootc install to-filesystem --skip-fetch-check \
6550
--disable-selinux --replace=alongside /target
6651
# Verify we injected static configs

0 commit comments

Comments
 (0)