From f19769957cda6b1fd3aaee12c9f4b00ec5172ade Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 15 Feb 2024 09:00:32 +0100 Subject: [PATCH 1/2] chore(ci): Ensure "Build & Test" workflow runs on `v7` --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b4eb8e140fc..2e4ea3f363a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,7 @@ on: push: branches: - develop + - v7 - master - release/** pull_request: @@ -168,7 +169,7 @@ jobs: changed_browser_integration: ${{ steps.changed.outputs.browser_integration }} changed_any_code: ${{ steps.changed.outputs.any_code }} # Note: These next three have to be checked as strings ('true'/'false')! - is_develop: ${{ github.ref == 'refs/heads/develop' }} + is_develop: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v7' }} is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }} # When merging into master, or from master is_gitflow_sync: ${{ github.head_ref == 'master' || github.ref == 'refs/heads/master' }} From 0cfb87c0cb03361033fac7a7e5daa761512069c8 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 15 Feb 2024 09:05:39 +0100 Subject: [PATCH 2/2] compare size check on v7 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e4ea3f363a1..3d02857a3611 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,6 +169,7 @@ jobs: changed_browser_integration: ${{ steps.changed.outputs.browser_integration }} changed_any_code: ${{ steps.changed.outputs.any_code }} # Note: These next three have to be checked as strings ('true'/'false')! + # is_develop for v7 now also means we're on the `v7` branch. is_develop: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v7' }} is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }} # When merging into master, or from master @@ -314,7 +315,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} skip_step: build - main_branch: develop + main_branch: v7 # When on release branch, we want to always run # Else, we fall back to the default handling of the action run_for_branch: ${{ (needs.job_get_metadata.outputs.is_release == 'true' && 'true') || '' }}