From 7390ae853ecadf68b49de0b6842e4931cd971b72 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Wed, 3 Mar 2021 16:00:20 +0100 Subject: [PATCH 1/2] Fix static files upload for production deployment --- .github/workflows/deploy-ewc.yml | 19 +++++++++++-------- .github/workflows/deploy-mainnet.yml | 19 +++++++++++-------- .github/workflows/deploy-rinkeby.yml | 21 ++++++++++++--------- .github/workflows/deploy-volta.yml | 20 +++++++++++--------- .github/workflows/deploy-xdai.yml | 19 +++++++++++-------- 5 files changed, 56 insertions(+), 42 deletions(-) diff --git a/.github/workflows/deploy-ewc.yml b/.github/workflows/deploy-ewc.yml index 88c7c48a..25feadd2 100644 --- a/.github/workflows/deploy-ewc.yml +++ b/.github/workflows/deploy-ewc.yml @@ -114,15 +114,18 @@ jobs: run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete # Script to upload release files - - run: bash ./scripts/github/deploy_release.sh + - name: 'Upload release build files for production' if: startsWith(github.ref, 'refs/tags/v') - env: - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - PR_NUMBER: ${{ github.event.number }} - REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} - REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} - VERSION_TAG: ${{ github.event.release.tag_name }} + run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }} --delete + # - run: bash ./scripts/github/deploy_release.sh + # if: startsWith(github.ref, 'refs/tags/v') + # env: + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # PR_NUMBER: ${{ github.event.number }} + # REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} + # REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} + # VERSION_TAG: ${{ github.event.release.tag_name }} # Script to prepare production deployments - run: bash ./scripts/github/prepare_production_deployment.sh diff --git a/.github/workflows/deploy-mainnet.yml b/.github/workflows/deploy-mainnet.yml index 6cef9c52..82b41feb 100644 --- a/.github/workflows/deploy-mainnet.yml +++ b/.github/workflows/deploy-mainnet.yml @@ -95,15 +95,18 @@ jobs: run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete # Script to upload release files - - run: bash ./scripts/github/deploy_release.sh + - name: 'Upload release build files for production' if: startsWith(github.ref, 'refs/tags/v') - env: - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - PR_NUMBER: ${{ github.event.number }} - REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} - REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} - VERSION_TAG: ${{ github.event.release.tag_name }} + run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }} --delete + # - run: bash ./scripts/github/deploy_release.sh + # if: startsWith(github.ref, 'refs/tags/v') + # env: + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # PR_NUMBER: ${{ github.event.number }} + # REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} + # REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} + # VERSION_TAG: ${{ github.event.release.tag_name }} # Script to prepare production deployments - run: bash ./scripts/github/prepare_production_deployment.sh diff --git a/.github/workflows/deploy-rinkeby.yml b/.github/workflows/deploy-rinkeby.yml index 1f4cc0e2..c1d45c35 100644 --- a/.github/workflows/deploy-rinkeby.yml +++ b/.github/workflows/deploy-rinkeby.yml @@ -121,17 +121,20 @@ jobs: run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete # Script to upload release files - - run: bash ./scripts/github/deploy_release.sh + - name: 'Upload release build files for production' if: startsWith(github.ref, 'refs/tags/v') - env: - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - PR_NUMBER: ${{ github.event.number }} - REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} - REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} - VERSION_TAG: ${{ github.event.release.tag_name }} + run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }} --delete + # - run: bash ./scripts/github/deploy_release.sh + # if: startsWith(github.ref, 'refs/tags/v') + # env: + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # PR_NUMBER: ${{ github.event.number }} + # REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} + # REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} + # VERSION_TAG: ${{ github.event.release.tag_name }} - # Script to prepare production deployments + # Script to notify production deployments - run: bash ./scripts/github/prepare_production_deployment.sh if: success() && startsWith(github.ref, 'refs/tags/v') env: diff --git a/.github/workflows/deploy-volta.yml b/.github/workflows/deploy-volta.yml index 3c1418be..cd3e7cb5 100644 --- a/.github/workflows/deploy-volta.yml +++ b/.github/workflows/deploy-volta.yml @@ -118,16 +118,18 @@ jobs: run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete # Script to upload release files - - run: bash ./scripts/github/deploy_release.sh + - name: 'Upload release build files for production' if: startsWith(github.ref, 'refs/tags/v') - env: - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - PR_NUMBER: ${{ github.event.number }} - REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} - REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} - VERSION_TAG: ${{ github.event.release.tag_name }} - + run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }} --delete + # - run: bash ./scripts/github/deploy_release.sh + # if: startsWith(github.ref, 'refs/tags/v') + # env: + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # PR_NUMBER: ${{ github.event.number }} + # REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} + # REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} + # VERSION_TAG: ${{ github.event.release.tag_name }} # Script to prepare production deployments - run: bash ./scripts/github/prepare_production_deployment.sh if: success() && startsWith(github.ref, 'refs/tags/v') diff --git a/.github/workflows/deploy-xdai.yml b/.github/workflows/deploy-xdai.yml index 1384779d..19fd4994 100644 --- a/.github/workflows/deploy-xdai.yml +++ b/.github/workflows/deploy-xdai.yml @@ -117,15 +117,18 @@ jobs: run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete # Script to upload release files - - run: bash ./scripts/github/deploy_release.sh + - name: 'Upload release build files for production' if: startsWith(github.ref, 'refs/tags/v') - env: - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - PR_NUMBER: ${{ github.event.number }} - REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} - REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} - VERSION_TAG: ${{ github.event.release.tag_name }} + run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }} --delete + # - run: bash ./scripts/github/deploy_release.sh + # if: startsWith(github.ref, 'refs/tags/v') + # env: + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # PR_NUMBER: ${{ github.event.number }} + # REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }} + # REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }} + # VERSION_TAG: ${{ github.event.release.tag_name }} # Script to prepare production deployments - run: bash ./scripts/github/prepare_production_deployment.sh From 88eeafd0aac5304bc93c7be45c610f54a816a1fe Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Wed, 3 Mar 2021 16:00:58 +0100 Subject: [PATCH 2/2] Set v3.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f549fdf1..a554bed7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "safe-react", - "version": "3.1.0", + "version": "3.1.1", "description": "Allowing crypto users manage funds in a safer way", "website": "https://github.com/gnosis/safe-react#readme", "bugs": {