Skip to content

Commit adecf2e

Browse files
committed
fix ordering, get digest from correct step, cache
1 parent 6a116c8 commit adecf2e

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

.github/workflows/bootc.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
workflow_dispatch:
1010
push:
1111

12+
env:
13+
CACHE_TAG: ghcr.io/ultramarine-linux/shade/cache
14+
1215
jobs:
1316
build:
1417
permissions:
@@ -59,30 +62,35 @@ jobs:
5962
sudo podman build \
6063
--platform "$BUILD_PLATFORM" \
6164
--layers=true \
65+
--cache-to $CACHE_TAG \
66+
--cache-from $CACHE_TAG \
6267
-f "${BUILD_CONTEXT}/Containerfile" \
6368
-t "$IMAGE_TAG" "$BUILD_CONTEXT"
6469
65-
- name: Get digest
66-
run: |
67-
DIGEST=$(sudo podman inspect --format '{{.Digest}}' "$IMAGE_TAG")
68-
echo "digest=$DIGEST" >> $GITHUB_OUTPUT
6970
7071
- name: Push to GHCR
7172
# if: github.event_name != 'pull_request'
7273
id: push
7374
run: |
7475
sudo podman push "$IMAGE_TAG"
7576
77+
- name: Get digest
78+
id: digest
79+
run: |
80+
DIGEST=$(sudo podman inspect --format '{{.Digest}}' "$IMAGE_TAG")
81+
echo "digest=$DIGEST" >> $GITHUB_OUTPUT
82+
7683
- name: Upload matrix outputs
7784
uses: cloudposse/github-action-matrix-outputs-write@v1
7885
id: out
7986
with:
8087
matrix-step-name: ${{ github.job }}
8188
matrix-key: ${{ matrix.variant.name }}
8289
outputs: |-
83-
digest: ${{ steps.push.outputs.digest }}
90+
digest: ${{ steps.digest.outputs.digest }}
8491
image: ${{ env.IMAGE_TAG }}
8592
manifest: "${{ needs.manifest.outputs.manifest }}"
93+
8694
manifest:
8795
runs-on: ubuntu-latest
8896
if: "!cancelled()"

0 commit comments

Comments
 (0)