Merge branch 'main' of github.com:vegaprotocol/frontend-monorepo into…

… develop
vegaprotocol · May 1, 2024 · 3bc48c7 · 3bc48c7
2 parents 1e7003a + d223dd2
commit 3bc48c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci-cd-trigger.yml b/.github/workflows/ci-cd-trigger.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - release/*
-      - develop
-      - main
   pull_request:
     types:
       - opened
@@ -170,11 +168,7 @@ jobs:
       - name: Check branch
         id: check-test
         run: |
-          if [[ "${{ github.base_ref }}" == "develop" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "main" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
             echo "e2e-needed=true" >> $GITHUB_OUTPUT
           else
             echo "e2e-needed=false" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/cleanup-resources.yml b/.github/workflows/cleanup-resources.yml
@@ -41,6 +41,9 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       APP_BUCKET_NAME: pr-${{ github.event.number }}.${{ matrix.app }}.previews.vega.rocks
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_DEFAULT_REGION: 'eu-west-1'
     steps:
       - name: Delete ${{ matrix.app }} preview app
         run: |

diff --git a/.github/workflows/publish-dist.yml b/.github/workflows/publish-dist.yml
@@ -145,6 +145,7 @@ jobs:
             vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
 
       - name: Sanity check docker image
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
         run: |
           echo "Check ipfs-hash"
           docker run --rm vegaprotocol/${{ matrix.app }}:${{ github.sha }} /bin/sh -c 'cat /ipfs-hash'