Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
PythonCoderAS committed Jan 15, 2024
2 parents fec4318 + 7a8109d commit 1e62e04
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
uses: docker/setup-buildx-action@v3.0.0

- name: Log into registry ${{ env.REGISTRY }}
if: ${{ !github.event.pull_request || github.event.pull_request.base.repo == github.event.pull_request.head.repo }}
uses: docker/login-action@v3.0.0
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -68,14 +69,16 @@ jobs:
platforms: ${{ matrix.platform }}
provenance: true
sbom: true
outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=${{ !github.event.pull_request || github.event.pull_request.base.repo == github.event.pull_request.head.repo }}

- name: Export digest
if: ${{ !github.event.pull_request || github.event.pull_request.base.repo == github.event.pull_request.head.repo }}
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/${digest#sha256:}"
- name: Upload digest
if: ${{ !github.event.pull_request || github.event.pull_request.base.repo == github.event.pull_request.head.repo }}
uses: actions/upload-artifact@v3
with:
name: digests
Expand All @@ -85,6 +88,7 @@ jobs:

merge:
runs-on: ubuntu-latest
if: ${{ !github.event.pull_request || github.event.pull_request.base.repo == github.event.pull_request.head.repo }}
needs:
- build
permissions:
Expand Down

0 comments on commit 1e62e04

Please sign in to comment.