Skip to content

merge queue: embarking main (8ffc693) and #54 together #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking main (8ffc693) and #54 together #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a59fec0
compute kernel cache key before build:
jacobweinstock Mar 9, 2026
63558ec
Merge of #54
mergify[bot] Mar 9, 2026
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
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,17 @@ jobs:
docker tag "${{ env.BUILDER_IMAGE }}:${HASH}" "${REMOTE}:${HASH}-${{ matrix.arch }}"
docker push "${REMOTE}:${HASH}-${{ matrix.arch }}"

- name: Compute kernel cache key
id: kernel-cache-key
run: echo "key=kernel-${{ matrix.arch }}-${{ env.KERNEL_VERSION }}-${{ hashFiles('kernel.configs/*', 'Dockerfile') }}" >> "$GITHUB_OUTPUT"

- name: Restore kernel cache
id: kernel-cache
uses: actions/cache/restore@v4
with:
path: |
mkosi.output/kernel/${{ env.KERNEL_VERSION }}/${{ matrix.arch }}
key: kernel-${{ matrix.arch }}-${{ env.KERNEL_VERSION }}-${{ hashFiles('kernel.configs/*', 'Dockerfile') }}
key: ${{ steps.kernel-cache-key.outputs.key }}

- name: Install Python dependencies
run: pip install -r requirements.txt
Expand All @@ -153,7 +157,7 @@ jobs:
with:
path: |
mkosi.output/kernel/${{ env.KERNEL_VERSION }}/${{ matrix.arch }}
key: kernel-${{ matrix.arch }}-${{ env.KERNEL_VERSION }}-${{ hashFiles('kernel.configs/*', 'Dockerfile') }}
key: ${{ steps.kernel-cache-key.outputs.key }}

- name: Upload kernel artifacts
uses: actions/upload-artifact@v4
Expand Down