File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change 43
43
TRIVY_VULNDB : " /home/runner/.local/share/containers/trivy_db"
44
44
# Targets (and their folder) that should be scanned using FS instead of IMAGE scan due to resource constraints
45
45
TRIVY_SCAN_FS_JSON : ' {}'
46
+ BUILD_ARCH : ${{ inputs.platform }}
46
47
47
48
steps :
48
49
@@ -326,8 +327,7 @@ jobs:
326
327
fromJson(inputs.github).event_name == 'workflow_dispatch' }}
327
328
env :
328
329
IMAGE_TAG : " ${{ steps.calculated_vars.outputs.IMAGE_TAG }}"
329
- # Configuring `podman build --platform=` through CONTAINER_BUILD_CACHE_ARGS is a venerable hack on this project
330
- CONTAINER_BUILD_CACHE_ARGS : " ${{ steps.extra-podman-build-args.outputs.EXTRA_PODMAN_BUILD_ARGS }} --platform=${{ inputs.platform }} --cache-from ${{ env.CACHE }} --cache-to ${{ env.CACHE }}"
330
+ CONTAINER_BUILD_CACHE_ARGS : " ${{ steps.extra-podman-build-args.outputs.EXTRA_PODMAN_BUILD_ARGS }} --cache-from ${{ env.CACHE }} --cache-to ${{ env.CACHE }}"
331
331
- name : " pull_request: make ${{ inputs.target }}"
332
332
run : |
333
333
# print running stats on disk occupancy
@@ -338,8 +338,7 @@ jobs:
338
338
fromJson(inputs.github).event_name == 'pull_request_target' }}"
339
339
env :
340
340
IMAGE_TAG : " ${{ steps.calculated_vars.outputs.IMAGE_TAG }}"
341
- # Configuring `podman build --platform=` through CONTAINER_BUILD_CACHE_ARGS is a venerable hack on this project
342
- CONTAINER_BUILD_CACHE_ARGS : " ${{ steps.extra-podman-build-args.outputs.EXTRA_PODMAN_BUILD_ARGS }} --platform=${{ inputs.platform }} --cache-from ${{ env.CACHE }}"
341
+ CONTAINER_BUILD_CACHE_ARGS : " ${{ steps.extra-podman-build-args.outputs.EXTRA_PODMAN_BUILD_ARGS }} --cache-from ${{ env.CACHE }}"
343
342
# We don't have access to image registry, so disable pushing
344
343
PUSH_IMAGES : " no"
345
344
You can’t perform that action at this time.
0 commit comments