Skip to content

Commit

Permalink
fix: arm build improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
dejanb committed Jul 5, 2024
1 parent 7f05363 commit 86938cb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ jobs:

with:
imageTag: ci
platforms: "linux/amd64, linux/arm64"
platforms: "linux/amd64"

helm-test:
runs-on: ubuntu-22.04
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ jobs:
- name: Generate container SBOM
run: |
syft ~/download/${{ matrix.name }}-container/${{ matrix.name }}-image.tar --output cyclonedx-json --catalogers rpm,cargo-auditable > staging/${{ matrix.name }}.sbom.json
cyclonedx merge --input-files staging/${{ matrix.name }}.sbom.json staging/trust-ui.project.sbom.json --output-file staging/${{ matrix.name }}.sbom.json
cyclonedx merge --input-files staging/${{ matrix.name }}.sbom.json staging/trust-ui.project.sbom.json --output-file staging/${{ matrix.name }}.sbom.json
- name: Log in to ghcr.io
uses: redhat-actions/podman-login@v1
Expand All @@ -335,7 +335,7 @@ jobs:
IMAGE="ghcr.io/${{ github.repository_owner }}/${{ matrix.name }}:${{ needs.init.outputs.version }}"
podman push \
"${{ matrix.name }}:ci" \
"${IMAGE}" \
"${IMAGE}" --all \
--digestfile "${RUNNER_TEMP}/push.${{ matrix.name }}.digest"
- name: Push to ghcr.io (as latest)
Expand All @@ -344,7 +344,7 @@ jobs:
run: |
IMAGE="ghcr.io/${{ github.repository_owner }}/${{ matrix.name }}:latest"
podman push \
"${{ matrix.name }}:ci" \
"${{ matrix.name }}:ci" --all \
"${IMAGE}"
- name: Sign the images with GitHub OIDC Token
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ jobs:
IMAGE="ghcr.io/${{ github.repository_owner }}/${{ matrix.name }}:${{ needs.init.outputs.version }}"
podman push \
"${{ matrix.name }}:ci" \
"${IMAGE}" \
"${IMAGE}" --all \
--digestfile "${RUNNER_TEMP}/push.${{ matrix.name }}.digest"
- name: Push to ghcr.io (as latest)
id: push-images-latest
run: |
IMAGE="ghcr.io/${{ github.repository_owner }}/${{ matrix.name }}:latest"
podman push \
"${{ matrix.name }}:ci" \
"${{ matrix.name }}:ci" --all \
"${IMAGE}"
- name: Sign the images with GitHub OIDC Token
Expand Down

0 comments on commit 86938cb

Please sign in to comment.