Merge pull request #36 from gnosischain/main

back-merge to dev bunch of hot-fixes on main branch
gnosischain · May 19, 2024 · ab38d73 · ab38d73
2 parents 29eb2c3 + 54f4d2d
commit ab38d73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/dev_ci.yml b/.github/workflows/dev_ci.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions/cache@v2
         with:
@@ -56,12 +56,12 @@ jobs:
         run: |
           aws s3 sync build/ s3://${{ secrets.DEV_BUCKET_NAME }}/dev --exclude "*.html" --cache-control max-age=0,no-cache,no-store,public
           aws s3 sync build/ s3://${{ secrets.DEV_BUCKET_NAME }}/dev --exclude "*" --include "*.html" --cache-control max-age=0,no-cache,no-store,must-revalidate --content-type text/html
-          aws s3 sync data/ s3://${{ secrets.DEV_BUCKET_NAME }}/dev
+          aws s3 sync data s3://${{ secrets.DEV_BUCKET_NAME }}/dev/data --delete
 
       # Script to deploy to staging environment
       - name: 'Deploy to S3: Staging'
         if: github.ref == 'refs/heads/main'
         run: |
           aws s3 sync build/ s3://${{ secrets.DEV_BUCKET_NAME }}/main --exclude "*.html" --cache-control max-age=0,no-cache,no-store,public
           aws s3 sync build/ s3://${{ secrets.DEV_BUCKET_NAME }}/main --exclude "*" --include "*.html" --cache-control max-age=0,no-cache,no-store,must-revalidate --content-type text/html
-          aws s3 sync data/ s3://${{ secrets.DEV_BUCKET_NAME }}/main
+          aws s3 sync data s3://${{ secrets.DEV_BUCKET_NAME }}/main/data --delete
diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml
@@ -27,12 +27,12 @@ jobs:
               run: |
                 for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
 
-            - uses: actions/checkout@v2
-              with:
-                fetch-tags: true
+            # Ref: https://github.com/actions/checkout/issues/1471#issuecomment-1771231294
+            - uses: actions/checkout@v4
 
             - name: Tag checkout
-              run:
+              run: |
+                git fetch --prune --unshallow --tags
                 git checkout ${{ github.event.inputs.tag }}
 
             - uses: actions/cache@v2
@@ -67,7 +67,7 @@ jobs:
                 aws s3 sync build/ s3://${{ secrets.RELEASE_BUCKET_NAME }} --delete --exclude "*.html" --exclude "sitemap.xml" --cache-control max-age=86400,public
                 aws s3 sync build/ s3://${{ secrets.RELEASE_BUCKET_NAME }} --delete --exclude "*" --include "*.html" --cache-control max-age=0,no-cache,no-store,must-revalidate --content-type text/html
                 aws s3 sync build/ s3://${{ secrets.RELEASE_BUCKET_NAME }} --delete --exclude "*" --include "sitemap.xml" --cache-control max-age=0,no-cache,no-store,must-revalidate --content-type text/xml
-                aws s3 sync data/ s3://${{ secrets.RELEASE_BUCKET_NAME }} --delete
+                aws s3 sync data s3://${{ secrets.RELEASE_BUCKET_NAME }}/data --delete
 
     notify:
       uses: ./.github/workflows/slack_release_notification.yml