From 7c785f7e78217616e88202a6f1ec699b49c83199 Mon Sep 17 00:00:00 2001 From: mcatech Date: Wed, 26 Jun 2024 10:02:09 -0400 Subject: [PATCH 1/7] ci: add Azure Static Web Apps workflow file on-behalf-of: @Azure opensource@microsoft.com --- ...e-static-web-apps-brave-wave-05c9ff40f.yml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml diff --git a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml new file mode 100644 index 0000000..fddd9c5 --- /dev/null +++ b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml @@ -0,0 +1,46 @@ +name: Azure Static Web Apps CI/CD + +on: + push: + branches: + - main + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - main + +jobs: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + runs-on: ubuntu-latest + name: Build and Deploy Job + steps: + - uses: actions/checkout@v3 + with: + submodules: true + lfs: false + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_WAVE_05C9FF40F }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/" # App source code path + api_location: "" # Api source code path - optional + output_location: "dist" # Built app content directory - optional + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_WAVE_05C9FF40F }} + action: "close" From b8afed147c2f72e94fbc27140b55dca0380fdcb1 Mon Sep 17 00:00:00 2001 From: Tim Neubrander Date: Wed, 26 Jun 2024 10:25:41 -0400 Subject: [PATCH 2/7] Update azure-static-web-apps-brave-wave-05c9ff40f.yml --- .../azure-static-web-apps-brave-wave-05c9ff40f.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml index fddd9c5..c5888b2 100644 --- a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml +++ b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml @@ -4,15 +4,18 @@ on: push: branches: - main - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main jobs: build_and_deploy_job: if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') runs-on: ubuntu-latest + env: + VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} + VITE_REMOTE_MENU_BASE_URL: ${{ vars.VITE_REMOTE_MENU_BASE_URL_LIVE }} + VITE_REMOTE_HEADER_MENU_ID: ${{ vars.VITE_REMOTE_HEADER_MENU_ID }} + VITE_REMOTE_FOOTER_MENU_ID: ${{ vars.VITE_REMOTE_FOOTER_MENU_ID }} + VITE_REMOTE_SOCIAL_LINKS_ID: ${{ vars.VITE_REMOTE_SOCIAL_LINKS_ID }} + VITE_LOCATION_API_URL: ${{ vars.VITE_LOCATION_API_URL_LIVE }} name: Build and Deploy Job steps: - uses: actions/checkout@v3 From c37e397ab476055f6c1ffde02c96397d2c80e7a1 Mon Sep 17 00:00:00 2001 From: Tim Neubrander Date: Wed, 26 Jun 2024 10:33:10 -0400 Subject: [PATCH 3/7] Update azure-static-web-apps-brave-wave-05c9ff40f.yml Add Environment identifier to workflow name. --- .../workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml index c5888b2..8e2e9f0 100644 --- a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml +++ b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml @@ -1,4 +1,4 @@ -name: Azure Static Web Apps CI/CD +name: Azure Static Web Apps CI/CD LIVE on: push: From d9437bfe9dc2b8ad46d8bbed54ac89bdb901d5eb Mon Sep 17 00:00:00 2001 From: Jim Barnes Date: Wed, 26 Jun 2024 11:29:26 -0400 Subject: [PATCH 4/7] Named the workflows and added workflow dispatch to develop job --- ...tic-web-apps-delightful-moss-0832eaa0f.yml | 8 +- ...-static-web-apps-lively-hill-0d219190f.yml | 98 +++++++++---------- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml index 8a5e2f7..8879d20 100644 --- a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml +++ b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml @@ -1,9 +1,15 @@ -name: Azure Static Web Apps CI/CD +name: Azure Static Web Apps CI/CD DEV on: push: branches: - develop + workflow_dispatch: + inputs: + manual_ref: + type: string + description: The tag or hash that needs to be deployed + jobs: build_and_deploy_job: diff --git a/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml b/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml index ddb5254..a0e7e9a 100644 --- a/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml +++ b/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml @@ -1,49 +1,49 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - test - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - env: - VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} - VITE_REMOTE_MENU_BASE_URL: ${{ vars.VITE_REMOTE_MENU_BASE_URL_TEST }} - VITE_REMOTE_HEADER_MENU_ID: ${{ vars.VITE_REMOTE_HEADER_MENU_ID }} - VITE_REMOTE_FOOTER_MENU_ID: ${{ vars.VITE_REMOTE_FOOTER_MENU_ID }} - VITE_REMOTE_SOCIAL_LINKS_ID: ${{ vars.VITE_REMOTE_SOCIAL_LINKS_ID }} - VITE_LOCATION_API_URL: ${{ vars.VITE_LOCATION_API_URL_TEST }} - name: Build and Deploy Job - steps: - - uses: actions/checkout@v3 - with: - submodules: true - lfs: false - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_HILL_0D219190F }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path - api_location: "" # Api source code path - optional - output_location: "dist" # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_HILL_0D219190F }} - action: "close" +name: Azure Static Web Apps CI/CD TEST + +on: + push: + branches: + - test + +jobs: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + runs-on: ubuntu-latest + env: + VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} + VITE_REMOTE_MENU_BASE_URL: ${{ vars.VITE_REMOTE_MENU_BASE_URL_TEST }} + VITE_REMOTE_HEADER_MENU_ID: ${{ vars.VITE_REMOTE_HEADER_MENU_ID }} + VITE_REMOTE_FOOTER_MENU_ID: ${{ vars.VITE_REMOTE_FOOTER_MENU_ID }} + VITE_REMOTE_SOCIAL_LINKS_ID: ${{ vars.VITE_REMOTE_SOCIAL_LINKS_ID }} + VITE_LOCATION_API_URL: ${{ vars.VITE_LOCATION_API_URL_TEST }} + name: Build and Deploy Job + steps: + - uses: actions/checkout@v3 + with: + submodules: true + lfs: false + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_HILL_0D219190F }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/" # App source code path + api_location: "" # Api source code path - optional + output_location: "dist" # Built app content directory - optional + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_HILL_0D219190F }} + action: "close" From ef5f22b9b87542d48068d5e12a56ca7e804405bd Mon Sep 17 00:00:00 2001 From: Jim Barnes Date: Wed, 26 Jun 2024 11:35:31 -0400 Subject: [PATCH 5/7] Added logic for manual ref --- .../azure-static-web-apps-delightful-moss-0832eaa0f.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml index 8879d20..55f46d5 100644 --- a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml +++ b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml @@ -25,6 +25,13 @@ jobs: name: Build and Deploy Job steps: - uses: actions/checkout@v3 + if: "${{ github.event.inputs.manual_ref != '' }}" + with: + submodules: true + lfs: false + ref: "${{ github.event.inputs.manual_ref }}" + - uses: actions/checkout@v3 + if: "${{ github.event.inputs.manual_ref == '' }}" with: submodules: true lfs: false From 8ce1301da6d6a3ebb997ef7592a8e5e63b55f583 Mon Sep 17 00:00:00 2001 From: Jim Barnes Date: Wed, 26 Jun 2024 11:39:55 -0400 Subject: [PATCH 6/7] Changed the job trigger if statement --- ...e-static-web-apps-delightful-moss-0832eaa0f.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml index 55f46d5..26e4cd7 100644 --- a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml +++ b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml @@ -13,7 +13,7 @@ on: jobs: build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch') runs-on: ubuntu-latest env: VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} @@ -48,15 +48,3 @@ jobs: api_location: "" # Api source code path - optional output_location: "dist" # Built app content directory - optional ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DELIGHTFUL_MOSS_0832EAA0F }} - action: "close" From 3a9f7bfca70dfe93aa367da903551835b032878a Mon Sep 17 00:00:00 2001 From: Jim Barnes Date: Wed, 26 Jun 2024 11:51:34 -0400 Subject: [PATCH 7/7] Updated workflow to have manual dispatch process --- ...e-static-web-apps-brave-wave-05c9ff40f.yml | 98 +++++++++---------- ...tic-web-apps-delightful-moss-0832eaa0f.yml | 3 +- ...-static-web-apps-lively-hill-0d219190f.yml | 26 ++--- 3 files changed, 63 insertions(+), 64 deletions(-) diff --git a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml index 8e2e9f0..c7ca52d 100644 --- a/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml +++ b/.github/workflows/azure-static-web-apps-brave-wave-05c9ff40f.yml @@ -1,49 +1,49 @@ -name: Azure Static Web Apps CI/CD LIVE - -on: - push: - branches: - - main - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - env: - VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} - VITE_REMOTE_MENU_BASE_URL: ${{ vars.VITE_REMOTE_MENU_BASE_URL_LIVE }} - VITE_REMOTE_HEADER_MENU_ID: ${{ vars.VITE_REMOTE_HEADER_MENU_ID }} - VITE_REMOTE_FOOTER_MENU_ID: ${{ vars.VITE_REMOTE_FOOTER_MENU_ID }} - VITE_REMOTE_SOCIAL_LINKS_ID: ${{ vars.VITE_REMOTE_SOCIAL_LINKS_ID }} - VITE_LOCATION_API_URL: ${{ vars.VITE_LOCATION_API_URL_LIVE }} - name: Build and Deploy Job - steps: - - uses: actions/checkout@v3 - with: - submodules: true - lfs: false - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_WAVE_05C9FF40F }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path - api_location: "" # Api source code path - optional - output_location: "dist" # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_WAVE_05C9FF40F }} - action: "close" +name: Azure Static Web Apps CI/CD LIVE + +on: + push: + branches: + - main + workflow_dispatch: + inputs: + manual_ref: + type: string + description: The tag or hash that needs to be deployed + +jobs: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch') + runs-on: ubuntu-latest + env: + VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} + VITE_REMOTE_MENU_BASE_URL: ${{ vars.VITE_REMOTE_MENU_BASE_URL_LIVE }} + VITE_REMOTE_HEADER_MENU_ID: ${{ vars.VITE_REMOTE_HEADER_MENU_ID }} + VITE_REMOTE_FOOTER_MENU_ID: ${{ vars.VITE_REMOTE_FOOTER_MENU_ID }} + VITE_REMOTE_SOCIAL_LINKS_ID: ${{ vars.VITE_REMOTE_SOCIAL_LINKS_ID }} + VITE_LOCATION_API_URL: ${{ vars.VITE_LOCATION_API_URL_LIVE }} + name: Build and Deploy Job + steps: + - uses: actions/checkout@v3 + if: "${{ github.event.inputs.manual_ref != '' }}" + with: + submodules: true + lfs: false + ref: "${{ github.event.inputs.manual_ref }}" + - uses: actions/checkout@v3 + if: "${{ github.event.inputs.manual_ref == '' }}" + with: + submodules: true + lfs: false + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_WAVE_05C9FF40F }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/" # App source code path + api_location: "" # Api source code path - optional + output_location: "dist" # Built app content directory - optional + ###### End of Repository/Build Configurations ###### diff --git a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml index 26e4cd7..4ef4e06 100644 --- a/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml +++ b/.github/workflows/azure-static-web-apps-delightful-moss-0832eaa0f.yml @@ -8,8 +8,7 @@ on: inputs: manual_ref: type: string - description: The tag or hash that needs to be deployed - + description: The tag or hash that needs to be deployed jobs: build_and_deploy_job: diff --git a/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml b/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml index a0e7e9a..d92431d 100644 --- a/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml +++ b/.github/workflows/azure-static-web-apps-lively-hill-0d219190f.yml @@ -4,10 +4,15 @@ on: push: branches: - test + workflow_dispatch: + inputs: + manual_ref: + type: string + description: The tag or hash that needs to be deployed jobs: build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch') runs-on: ubuntu-latest env: VITE_MAPBOX_TOKEN: ${{ vars.VITE_MAPBOX_TOKEN }} @@ -19,6 +24,13 @@ jobs: name: Build and Deploy Job steps: - uses: actions/checkout@v3 + if: "${{ github.event.inputs.manual_ref != '' }}" + with: + submodules: true + lfs: false + ref: "${{ github.event.inputs.manual_ref }}" + - uses: actions/checkout@v3 + if: "${{ github.event.inputs.manual_ref == '' }}" with: submodules: true lfs: false @@ -35,15 +47,3 @@ jobs: api_location: "" # Api source code path - optional output_location: "dist" # Built app content directory - optional ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_HILL_0D219190F }} - action: "close"