Merge branch 'main' into test

UCF · Jun 26, 2024 · 1df1683 · 1df1683
2 parents 824ba10 + 3a9f7bf
commit 1df1683
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 63 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
@@ -0,0 +1,49 @@
+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
@@ -1,13 +1,18 @@
-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:
-    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_DELIGHTFUL_MOSS_0832EAA0F }}
-          action: "close"
diff --git 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
+  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_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
+        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_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 ######