Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could add an option to the action which fetches bcvk's binary built from git main or so

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that'd help

- name: Validate (default)
run: just validate
# Check for security vulnerabilities and license compliance
Expand All @@ -106,7 +106,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
- name: Enable fsverity for /
run: sudo tune2fs -O verity $(findmnt -vno SOURCE /)
- name: Install utils
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
- name: Build mdbook
run: just build-mdbook
# Build packages for each test OS
Expand All @@ -188,7 +188,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main

- name: Setup env
run: |
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
with:
libvirt: true
- name: Install tmt
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
with:
libvirt: true
- name: Install tmt
Expand Down Expand Up @@ -399,7 +399,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
with:
libvirt: true
- name: Install tmt
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Bootc Ubuntu Setup
uses: bootc-dev/actions/bootc-ubuntu-setup@main
uses: Johan-Liebert1/bootc-actions/bootc-ubuntu-setup@main
with:
libvirt: true

Expand Down
17 changes: 15 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,13 @@ build: package _keygen && _pull-lbi-images
test -d target/packages
pkg_path=$(realpath target/packages)
eval $(just _git-build-vars)
podman build {{_nocache_arg}} --build-arg=image_version=${VERSION} --build-context "packages=${pkg_path}" -t {{base_img}} {{buildargs}} .

podman build {{_nocache_arg}} \
--build-arg=SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
--build-arg=image_version=${VERSION} \
--build-arg=pkgversion=${VERSION} \
--build-context "packages=${pkg_path}" \
-t {{base_img}} {{buildargs}} .

# Fetch all external dependencies with a retry loop.
#
Expand Down Expand Up @@ -389,7 +395,14 @@ package:
if [[ -z "{{no_auto_local_deps}}" ]]; then
local_deps_args=$(cargo xtask local-rust-deps)
fi
podman build {{base_buildargs}} --build-arg=SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} --build-arg=pkgversion=${VERSION} -t localhost/bootc-pkg --target=build $local_deps_args .

podman build {{base_buildargs}} \
--build-arg=SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
--build-arg=image_version=${VERSION} \
--build-arg=pkgversion=${VERSION} \
-t localhost/bootc-pkg \
--target=build $local_deps_args .

mkdir -p "${packages}"
rm -vf "${packages}"/*.rpm
podman run --rm localhost/bootc-pkg tar -C /out/ -cf - . | tar -C "${packages}"/ -xvf -
Expand Down
Loading
Loading