From b7a615ef51cd34c2ef9bedc14c843e21246ab880 Mon Sep 17 00:00:00 2001 From: Hamdi-Hassan <108127791+Hamdi-Hassan@users.noreply.github.com> Date: Sat, 4 Feb 2023 16:20:11 +0000 Subject: [PATCH 1/4] Update nonproduction.yaml --- { .github => .github}/workflows/nonproduction.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename { .github => .github}/workflows/nonproduction.yaml (85%) diff --git a/ .github/workflows/nonproduction.yaml b/.github/workflows/nonproduction.yaml similarity index 85% rename from .github/workflows/nonproduction.yaml rename to .github/workflows/nonproduction.yaml index 013455b5..3366db08 100644 --- a/ .github/workflows/nonproduction.yaml +++ b/.github/workflows/nonproduction.yaml @@ -3,13 +3,13 @@ name: Deploy feature branches to nonproduction on: push: branches: - - feature* + - solution* jobs: build: runs-on: ubuntu-latest env: - BUCKET_NAME: + BUCKET_NAME: global-terraform.com steps: - name: Checkout code uses: actions/checkout@v2 @@ -18,7 +18,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-region: ${{ secrets.AWS_REGION }} - name: Use Node.js uses: actions/setup-node@v2 with: @@ -30,4 +30,4 @@ jobs: - name: Deploy bundle to bucket run: | echo 'copying files to s3 bucket' - aws s3 cp public s3://${{ env.BUCKET_NAME }}/ --recursive --acl public-read \ No newline at end of file + aws s3 cp public s3://${{ env.BUCKET_NAME }}/ --recursive --acl public-read From 69b42536752180e3f2bbae44de7a17ebf60d17d3 Mon Sep 17 00:00:00 2001 From: Hamdi-Hassan <108127791+Hamdi-Hassan@users.noreply.github.com> Date: Sat, 4 Feb 2023 16:24:55 +0000 Subject: [PATCH 2/4] Update nonproduction.yaml used a new bucket --- .github/workflows/nonproduction.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nonproduction.yaml b/.github/workflows/nonproduction.yaml index 3366db08..125207b9 100644 --- a/.github/workflows/nonproduction.yaml +++ b/.github/workflows/nonproduction.yaml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest env: - BUCKET_NAME: global-terraform.com + BUCKET_NAME: test-bckt-gha steps: - name: Checkout code uses: actions/checkout@v2 From bfab8bc10322235d36a2f5ef0123c494b66344cc Mon Sep 17 00:00:00 2001 From: Hamdi-Hassan <108127791+Hamdi-Hassan@users.noreply.github.com> Date: Sat, 4 Feb 2023 16:29:53 +0000 Subject: [PATCH 3/4] Update production.yaml deploy to prod --- { .github => .github}/workflows/production.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename { .github => .github}/workflows/production.yaml (87%) diff --git a/ .github/workflows/production.yaml b/.github/workflows/production.yaml similarity index 87% rename from .github/workflows/production.yaml rename to .github/workflows/production.yaml index f0fbc994..7a656845 100644 --- a/ .github/workflows/production.yaml +++ b/.github/workflows/production.yaml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest env: - BUCKET_NAME: + BUCKET_NAME: prod-bckt-gha steps: - name: Checkout code uses: actions/checkout@v2 @@ -19,7 +19,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-region: ${{ secrets.AWS_REGION }} - name: Use Node.js uses: actions/setup-node@v2 with: @@ -31,4 +31,4 @@ jobs: - name: Deploy bundle to bucket run: | echo 'copying files to s3 bucket' - aws s3 cp public s3://${{ env.BUCKET_NAME }}/ --recursive --acl public-read \ No newline at end of file + aws s3 cp public s3://${{ env.BUCKET_NAME }}/ --recursive --acl public-read From f6c5dd50b77e79efa65797137d077cff5f9eb0c9 Mon Sep 17 00:00:00 2001 From: Hamdi-Hassan <108127791+Hamdi-Hassan@users.noreply.github.com> Date: Sat, 4 Feb 2023 16:35:51 +0000 Subject: [PATCH 4/4] Update production.yaml change branch name --- .github/workflows/production.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml index 7a656845..e2013ac5 100644 --- a/.github/workflows/production.yaml +++ b/.github/workflows/production.yaml @@ -3,7 +3,7 @@ name: Deploy to production on: push: branches: - - main + - solution* jobs: