Skip to content

Commit

Permalink
Add systemd boot standard image to the build matrix
Browse files Browse the repository at this point in the history
to make it easier to build UKI artifacts from it

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
  • Loading branch information
jimmykarily committed Oct 14, 2024
1 parent 473bc83 commit c21ca74
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ jobs:
-FLAVOR_RELEASE=${{ matrix.flavorRelease }} \
-FAMILY=${{ matrix.family }} \
-BASE_IMAGE=${{ matrix.baseImage }}
-BOOTLOADER=${{ matrix.bootloader || "grub" }}
- name: Convert all json files into a reports.tar.gz file
run: |
cd build
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
sudo apt update && sudo apt install -y jq
- id: set-matrix
run: |
content=`cat ./.github/flavors.json | jq -r 'map(select(.arch == "amd64" and .variant == "core" and (.flavor == "fedora" or (.flavor == "ubuntu" and (.flavorRelease == "24.04")))))'`
content=`cat ./.github/flavors.json | jq -r 'map(select(.arch == "amd64" and (.flavor == "fedora" or (.flavor == "ubuntu" and (.flavorRelease == "24.04")))))'`
# the following lines are only required for multi line json
content="${content//'%'/'%25'}"
content="${content//$'\n'/'%0A'}"
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
with:
sarif_file: 'grype-sarif'
category: ${{ matrix.flavor }}-grype
build-core-uki:
build-uki-container-image:
runs-on: ubuntu-latest
permissions:
id-token: write # OIDC support
Expand Down Expand Up @@ -457,6 +457,7 @@ jobs:
--MODEL=${{ matrix.model }} \
--K3S_VERSION=${{ matrix.k3s_version }} \
--BASE_IMAGE=${{ matrix.baseImage }}
--BOOTLOADER=${{ matrix.bootloader || "grub" }}
sudo mv build release
- name: Push to quay
Expand Down

0 comments on commit c21ca74

Please sign in to comment.