From 7dd523e4dd8f026a4190579628829980e6bc5904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20M=2E=20Ottestad?= Date: Sat, 28 Jun 2025 12:36:53 +0200 Subject: [PATCH 1/2] Add permissions to the github workflow that creates a PR for merging main into develop (#5362) --- .github/workflows/merge_main_to_develop.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/merge_main_to_develop.yml b/.github/workflows/merge_main_to_develop.yml index 7e35baaeb31..ab71a41af1e 100644 --- a/.github/workflows/merge_main_to_develop.yml +++ b/.github/workflows/merge_main_to_develop.yml @@ -5,8 +5,15 @@ on: branches: - "main" +concurrency: + group: ${{ github.ref }}-sync + cancel-in-progress: true + jobs: pull-request: + permissions: + contents: read + pull-requests: write runs-on: ubuntu-latest steps: - name: Checkout From f6a72a9916d8e380fa2466ba98043c214b5b96c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20M=2E=20Ottestad?= Date: Sat, 28 Jun 2025 13:59:58 +0200 Subject: [PATCH 2/2] Fix GitHub ci merge main into develop (#5363) allow contents write --- .github/workflows/merge_main_to_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge_main_to_develop.yml b/.github/workflows/merge_main_to_develop.yml index ab71a41af1e..7f7ded2c8a6 100644 --- a/.github/workflows/merge_main_to_develop.yml +++ b/.github/workflows/merge_main_to_develop.yml @@ -12,7 +12,7 @@ concurrency: jobs: pull-request: permissions: - contents: read + contents: write pull-requests: write runs-on: ubuntu-latest steps: