Skip to content

Commit 86539ff

Browse files
committed
ci: fix Docker builds
1 parent 3aa71fd commit 86539ff

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/docker.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ jobs:
191191
- name: Run tests
192192
if: ${{ !fromJson(needs.prepare.outputs.push) }}
193193
run: |
194+
# TODO: remove "containerimage.config.digest" fallback once all runners use buildx v0.18+
195+
# which replaced it with "containerimage.digest" and "containerimage.descriptor"
194196
docker run --platform="${PLATFORM}" --rm \
195-
"$(jq -r ".\"builder-${VARIANT}\".\"containerimage.config.digest\"" <<< "${METADATA}")" \
197+
"$(jq -r ".\"builder-${VARIANT}\" | .\"containerimage.config.digest\" // .\"containerimage.digest\"" <<< "${METADATA}")" \
196198
sh -c "./go.sh test ${RACE} -v $(./go.sh list ./... | grep -v github.com/dunglas/frankenphp/internal/testext | grep -v github.com/dunglas/frankenphp/internal/extgen | tr '\n' ' ') && cd caddy && ../go.sh test ${RACE} -v ./..."
197199
env:
198200
METADATA: ${{ steps.build.outputs.metadata }}

0 commit comments

Comments
 (0)