From 6e1cd228cc2cc9f5422e091839ea780ad2122e55 Mon Sep 17 00:00:00 2001 From: Vasia1101 Date: Wed, 17 Jun 2026 08:26:14 +0300 Subject: [PATCH 1/4] ci: add Azure Static Web Apps workflow file on-behalf-of: @Azure opensource@microsoft.com --- ...e-static-web-apps-calm-plant-0fb33f903.yml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml diff --git a/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml b/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml new file mode 100644 index 0000000..d2c0937 --- /dev/null +++ b/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.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_CALM_PLANT_0FB33F903 }} + 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_CALM_PLANT_0FB33F903 }} + action: "close" From 924cb7151783382842fa2bbeb85f10957d275a03 Mon Sep 17 00:00:00 2001 From: Vasia1101 Date: Wed, 17 Jun 2026 08:52:40 +0300 Subject: [PATCH 2/4] Remove unused Static Web Apps workflow --- ...ic-web-apps-agreeable-ground-01c3b230f.yml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/workflows/azure-static-web-apps-agreeable-ground-01c3b230f.yml diff --git a/.github/workflows/azure-static-web-apps-agreeable-ground-01c3b230f.yml b/.github/workflows/azure-static-web-apps-agreeable-ground-01c3b230f.yml deleted file mode 100644 index 3916c50..0000000 --- a/.github/workflows/azure-static-web-apps-agreeable-ground-01c3b230f.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - main - - dev - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main - - dev - -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_AGREEABLE_GROUND_01C3B230F }} - 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_AGREEABLE_GROUND_01C3B230F }} - action: "close" From bfc5d9027f75f1998ab31e43308d02858bf5889d Mon Sep 17 00:00:00 2001 From: Vasia1101 Date: Wed, 17 Jun 2026 09:05:47 +0300 Subject: [PATCH 3/4] Fix frontend deployment workflows --- ...e-static-web-apps-calm-plant-0fb33f903.yml | 64 +++---------------- .github/workflows/deploy-dev.yml | 51 +-------------- 2 files changed, 9 insertions(+), 106 deletions(-) diff --git a/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml b/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml index 9d418d9..0e8fcd3 100644 --- a/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml +++ b/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml @@ -1,67 +1,19 @@ -<<<<<<<< HEAD:.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml -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_CALM_PLANT_0FB33F903 }} - 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_CALM_PLANT_0FB33F903 }} - action: "close" -======== -name: Frontend DEV Deploy +name: Frontend PROD Deploy on: push: branches: - - dev + - main pull_request: types: [opened, synchronize, reopened, closed] branches: - - dev + - 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 + name: Build and Deploy PROD steps: - uses: actions/checkout@v4 with: @@ -72,20 +24,21 @@ jobs: run: | echo "REACT_APP_BUILD_SHA=${GITHUB_SHA::7}" > .env echo "REACT_APP_BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> .env - echo "REACT_APP_ENVIRONMENT=DEV" >> .env + echo "REACT_APP_ENVIRONMENT=PROD" >> .env cat .env - 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_HAPPY_ISLAND_094FE5703 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_PLANT_0FB33F903 }} repo_token: ${{ secrets.GITHUB_TOKEN }} action: "upload" app_location: "/" api_location: "" output_location: "dist" app_build_command: "npm run build" + production_branch: "main" close_pull_request_job: if: github.event_name == 'pull_request' && github.event.action == 'closed' @@ -96,6 +49,5 @@ jobs: id: closepullrequest uses: Azure/static-web-apps-deploy@v1 with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_HAPPY_ISLAND_094FE5703 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_PLANT_0FB33F903 }} action: "close" ->>>>>>>> dev:.github/workflows/deploy-dev.yml diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 327d9e6..1c94cdd 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -1,51 +1,3 @@ -<<<<<<<< HEAD:.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml -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_CALM_PLANT_0FB33F903 }} - 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_CALM_PLANT_0FB33F903 }} - action: "close" -======== name: Frontend DEV Deploy on: @@ -61,7 +13,7 @@ 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 + name: Build and Deploy DEV steps: - uses: actions/checkout@v4 with: @@ -98,4 +50,3 @@ jobs: with: azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_HAPPY_ISLAND_094FE5703 }} action: "close" ->>>>>>>> dev:.github/workflows/deploy-dev.yml From 995a840b4ecc42c19925ebe1fcd9aa7909c5228a Mon Sep 17 00:00:00 2001 From: Vasia1101 Date: Wed, 17 Jun 2026 09:23:56 +0300 Subject: [PATCH 4/4] Remove unused blank workflow --- ...e-static-web-apps-calm-plant-0fb33f903.yml | 6 ++-- .github/workflows/blank.yml | 33 ------------------- .github/workflows/deploy-dev.yml | 6 ++-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 .github/workflows/blank.yml diff --git a/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml b/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml index 0e8fcd3..8830d49 100644 --- a/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml +++ b/.github/workflows/azure-static-web-apps-calm-plant-0fb33f903.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest name: Build and Deploy PROD steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 with: submodules: true lfs: false @@ -29,7 +29,7 @@ jobs: - name: Build And Deploy id: builddeploy - uses: Azure/static-web-apps-deploy@v1 + uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 with: azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_PLANT_0FB33F903 }} repo_token: ${{ secrets.GITHUB_TOKEN }} @@ -47,7 +47,7 @@ jobs: steps: - name: Close Pull Request id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 + uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 with: azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_PLANT_0FB33F903 }} action: "close" diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml deleted file mode 100644 index d6783e2..0000000 --- a/.github/workflows/blank.yml +++ /dev/null @@ -1,33 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: CI - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs a single command using the runners shell - - name: Run a one-line script - run: echo Hello, world! - - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 1c94cdd..1cd18ec 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest name: Build and Deploy DEV steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 with: submodules: true lfs: false @@ -29,7 +29,7 @@ jobs: - name: Build And Deploy id: builddeploy - uses: Azure/static-web-apps-deploy@v1 + uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 with: azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_HAPPY_ISLAND_094FE5703 }} repo_token: ${{ secrets.GITHUB_TOKEN }} @@ -46,7 +46,7 @@ jobs: steps: - name: Close Pull Request id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 + uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 with: azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_HAPPY_ISLAND_094FE5703 }} action: "close"