Skip to content

Commit d126574

Browse files
committed
ci: Update podman on fedora-container-tests too
So we can use heredocs. Signed-off-by: Colin Walters <[email protected]>
1 parent ec67fbd commit d126574

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/ci.yml

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ jobs:
4646
if: ${{ !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
4747
runs-on: ubuntu-24.04
4848
steps:
49+
- name: Get a newer podman for heredoc support (from debian testing)
50+
run: |
51+
set -eux
52+
echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
53+
sudo apt update
54+
sudo apt install -y crun/testing podman/testing skopeo/testing
4955
- uses: actions/checkout@v4
5056
- name: Build container (fedora)
5157
run: sudo podman build --build-arg=base=quay.io/fedora/fedora-bootc:41 -t localhost/bootc -f hack/Containerfile .

hack/Containerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ RUN --mount=type=bind,from=context,target=/run/context <<EORUN
3535
set -xeuo pipefail
3636
/run/context/hack/provision-derived.sh "$variant"
3737
# Add some testing kargs into our dev builds
38-
cp -a /run/context/hack/test-kargs /usr/lib/bootc/kargs.d/
38+
cp -a /run/context/hack/test-kargs/ /usr/lib/bootc/kargs.d/
3939
# Also copy in some default install configs we use for testing
40-
cp -a /run/context/hack/install-test-configs/* /usr/lib/bootc/install/
40+
cp -a /run/context/hack/install-test-configs/ /usr/lib/bootc/install/
4141
# Finally only in this containerfile, inject a file which signifies
4242
# this comes from this development image.
4343
touch /usr/lib/.bootc-dev-stamp

0 commit comments

Comments
 (0)