Merge pull request #154 from kaleido-io/update-packages

Update packages
hyperledger · Sep 19, 2024 · 7c86f7c · 7c86f7c
2 parents 01d5eae + 1a1b296
commit 7c86f7c
Show file tree

Hide file tree

Showing 3 changed files with 208 additions and 148 deletions.
diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml
@@ -2,8 +2,9 @@ name: Docker Main Build
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
   docker:
@@ -32,14 +33,17 @@ jobs:
             --tag ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
 
       - name: Tag release
+        if: github.event.pull_request.merged == true
         run: docker tag ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly-tokens-erc1155:head
 
       - name: Push docker image
+        if: github.event.pull_request.merged == true
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
           docker push ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }}
 
       - name: Push head tag
+        if: github.event.pull_request.merged == true
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
           docker push ghcr.io/hyperledger/firefly-tokens-erc1155:head