Skip to content

Commit c6d374d

Browse files
europaulclaude
andcommitted
build: add HV=k package build to PR workflow
When building EVE with HV=k, the Makefile includes additional packages (kube, external-boot-image) and builds pillar with build-k.yml instead of build.yml. Without a separate package build step for HV=k, the eve job fails because these packages are missing from the linuxkit cache. Add an amd64/generic/k entry to the packages matrix so that k-specific packages are built and cached separately. Update all cache keys to include the hv dimension (using 'default' for non-k builds and 'k' for the kubernetes variant). Signed-off-by: Paul Hendry <phendry@zededa.com> Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Paul Gaiduk <paulg@zededa.com>
1 parent 82b94f8 commit c6d374d

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,20 @@ jobs:
2424
matrix:
2525
arch: [ arm64, amd64, riscv64 ]
2626
platform: [ generic ]
27+
hv: [ default ]
2728
include:
2829
- arch: arm64
2930
platform: nvidia-jp5
31+
hv: default
3032
- arch: arm64
3133
platform: nvidia-jp6
34+
hv: default
3235
- arch: amd64
3336
platform: evaluation
37+
hv: default
38+
- arch: amd64
39+
platform: generic
40+
hv: k
3441
runs-on: ${{ matrix.arch == 'arm64' && 'zededa-ubuntu-2204-arm64' || 'zededa-ubuntu-2204' }}
3542

3643
steps:
@@ -74,10 +81,10 @@ jobs:
7481
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
7582
with:
7683
path: ~/.linuxkit/cache
77-
key: linuxkit-${{ matrix.arch }}-${{ github.event.pull_request.head.sha }}-${{ matrix.platform }}
78-
- name: Build packages ${{ matrix.os }} for ${{ matrix.platform }}
84+
key: linuxkit-${{ matrix.arch }}-${{ github.event.pull_request.head.sha }}-${{ matrix.platform }}-${{ matrix.hv }}
85+
- name: Build packages for ${{ matrix.platform }} HV=${{ matrix.hv }}
7986
run: |
80-
make V=1 PRUNE=1 PLATFORM=${{ matrix.platform }} ZARCH=${{ matrix.arch }} pkgs
87+
make V=1 PRUNE=1 PLATFORM=${{ matrix.platform }} ZARCH=${{ matrix.arch }} ${{ matrix.hv != 'default' && format('HV={0}', matrix.hv) || '' }} pkgs
8188
- name: Post package report
8289
run: |
8390
echo Disk usage
@@ -136,7 +143,7 @@ jobs:
136143
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
137144
with:
138145
path: ~/.linuxkit/cache
139-
key: linuxkit-amd64-${{ github.event.pull_request.head.sha }}-generic
146+
key: linuxkit-amd64-${{ github.event.pull_request.head.sha }}-generic-default
140147
fail-on-cache-miss: true
141148
- name: load amd64 tools into docker for riscv64 cross-build
142149
if: ${{ matrix.arch == 'riscv64' }}
@@ -150,7 +157,7 @@ jobs:
150157
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
151158
with:
152159
path: ~/.linuxkit/cache
153-
key: linuxkit-${{ matrix.arch }}-${{ github.event.pull_request.head.sha }}-${{ matrix.platform == 'rt' && 'generic' || matrix.platform }}
160+
key: linuxkit-${{ matrix.arch }}-${{ github.event.pull_request.head.sha }}-${{ matrix.platform == 'rt' && 'generic' || matrix.platform }}-${{ matrix.hv == 'k' && 'k' || 'default' }}
154161
fail-on-cache-miss: true
155162
# For native builds, load tool images from the target cache we just restored.
156163
- name: load tool images into docker

0 commit comments

Comments
 (0)