From 44552ccf75e95a9a5676ac19581198d2622fac89 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 5 May 2025 15:26:51 +0200 Subject: [PATCH] build(dev): update all github workflows with new default branch name --- .github/workflows/azure-backoffice.yml | 8 +++++--- .github/workflows/azure-storybook.yml | 8 +++++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/test-backoffice.yml | 6 ++++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/azure-backoffice.yml b/.github/workflows/azure-backoffice.yml index 46597a42fd..b22b1d36ee 100644 --- a/.github/workflows/azure-backoffice.yml +++ b/.github/workflows/azure-backoffice.yml @@ -3,8 +3,9 @@ name: Backoffice Static Web Apps CI/CD on: push: branches: - - contrib + - main - v*/dev + - v*/main paths: - src/Umbraco.Web.UI.Client/package.json - src/Umbraco.Web.UI.Client/package-lock.json @@ -13,8 +14,9 @@ on: pull_request: types: [opened, synchronize, reopened, closed] branches: - - contrib + - main - v*/dev + - v*/main jobs: build_and_deploy_job: @@ -29,7 +31,7 @@ jobs: id: builddeploy uses: Azure/static-web-apps-deploy@v1 with: - production_branch: contrib + production_branch: main azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_VICTORIOUS_GROUND_017B08103 }} repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) action: "upload" diff --git a/.github/workflows/azure-storybook.yml b/.github/workflows/azure-storybook.yml index 6702a443cb..0da6fddfbe 100644 --- a/.github/workflows/azure-storybook.yml +++ b/.github/workflows/azure-storybook.yml @@ -3,8 +3,9 @@ name: Storybook CI/CD on: push: branches: - - contrib + - main - v*/dev + - v*/main paths: - src/Umbraco.Web.UI.Client/package.json - src/Umbraco.Web.UI.Client/package-lock.json @@ -13,8 +14,9 @@ on: pull_request: types: [opened, synchronize, reopened, closed] branches: - - contrib + - main - v*/dev + - v*/main env: NODE_OPTIONS: --max_old_space_size=16384 @@ -30,7 +32,7 @@ jobs: id: builddeploy uses: Azure/static-web-apps-deploy@v1 with: - production_branch: contrib + production_branch: main azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ORANGE_SEA_0C7411A03 }} repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) action: "upload" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 35e84006a2..d82b3f6170 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -4,15 +4,15 @@ on: push: branches: - "*/dev" - - "*/contrib" - - "contrib" + - "*/main" + - "main" - "release/*" pull_request: # The branches below must be a subset of the branches above branches: - "*/dev" - - "*/contrib" - - "contrib" + - "*/main" + - "main" - "release/*" schedule: - cron: "33 2 * * 1" diff --git a/.github/workflows/test-backoffice.yml b/.github/workflows/test-backoffice.yml index 92d89fcdd8..9b4407bd55 100644 --- a/.github/workflows/test-backoffice.yml +++ b/.github/workflows/test-backoffice.yml @@ -3,16 +3,18 @@ name: Test Backoffice on: push: branches: - - contrib + - main - release/* - v*/dev + - v*/main paths: - src/Umbraco.Web.UI.Client/** pull_request: branches: - - contrib + - main - release/* - v*/dev + - v*/main paths: - src/Umbraco.Web.UI.Client/**