chore: merge release into master (#3818)

Author: thoniTUB

.github/workflows/bump-external-submodule.yml

@@ -11,7 +11,6 @@ jobs:
     timeout-minutes: 1
     steps:
       - name: Trigger webhook event
-      
         env: 
           URL: ${{ secrets.EXTERNAL_REPO_BUMP_WEBHOOK }}
           TOKEN: ${{ secrets.EXTERNAL_REPO_BUMP_WEBHOOK_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up JDK
       uses: actions/setup-java@v5
@@ -53,7 +53,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,7 +65,7 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       if: matrix.language != 'java'
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -80,4 +80,4 @@ jobs:
         ./scripts/build_backend_version.sh "version_placeholder"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/create-image.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           submodules: true
           # Fetch all tags
@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           submodules: true
           # Fetch all tags

.github/workflows/helm_chart.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Helm
         uses: azure/setup-helm@v4
@@ -32,7 +32,7 @@ jobs:
     if: github.ref == 'refs/heads/master'
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Helm
         uses: azure/setup-helm@v4

.github/workflows/lint_openapi.yml

@@ -11,7 +11,7 @@ jobs:
     container: dshanley/vacuum
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: "Lint OpenApi spec for /api"
         run: vacuum lint --details ./openapi.yaml
       - name: "Lint OpenApi spec for external form backends"

.github/workflows/prepare-merge-release.yml

@@ -5,18 +5,31 @@ on:
     branches:
       - release
 
+
+env:
+  MAIN_BRANCH_NAME: master
+
 jobs:
   merge-release:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+
+      - name: Check for existing pull-request
+        id: check_pr_count
+        run: >
+          echo "pr_count=$(gh pr list --head release --limit 1 --base $MAIN_BRANCH_NAME --state open --json state --jq 'length')" >> "$GITHUB_OUTPUT"
 
-      - name: pull-request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: "master"
-          pr_title: "Merge Release"
-          pr_reviewer: "thoniTUB,awildturtok"
-          pr_assignee: "thoniTUB,awildturtok"
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create pull-request
+        if: ${{ steps.check_pr_count.outputs.pr_count == 0 }}
+        run: >
+          gh pr create
+          -l automated
+          -a awildturtok,thoniTUB
+          -r awildturtok,thoniTUB
+          -B $MAIN_BRANCH_NAME
+          --title "chore: merge release into $MAIN_BRANCH_NAME"
+          --body "Merge release branch into $MAIN_BRANCH_NAME branch"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reintegrate-master.yml

@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 3
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.REPO_SCOPED_TOKEN }}
           submodules: true
@@ -27,14 +27,21 @@ jobs:
         run: git checkout -b $REINTEGRATE_BRANCH_NAME
       - name: Push intermediate Branch
         run: git push -f
+
+      - name: Check for existing pull-request
+        id: check_pr_count
+        run: >
+          echo "pr_count=$(gh pr list --head $REINTEGRATE_BRANCH_NAME --limit 1 --base develop --state open --json state --jq 'length')" >> "$GITHUB_OUTPUT"
+
       - name: Create pull-request
+        if: ${{ steps.check_pr_count.outputs.pr_count == 0 }}
         run: >
           gh pr create
           -l automated
           -a awildturtok,thoniTUB
           -r awildturtok,thoniTUB
           -B develop
-          --title "Reintegrate Main"
+          --title "chore: reintegrate main branch"
           --body "Merge main branch back into develop branch"
           --head $REINTEGRATE_BRANCH_NAME
         env:

.github/workflows/release_backend.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           submodules: true
           # This should be deep enough to fetch at least one light weight tag

.github/workflows/run_autodoc.yml

@@ -24,7 +24,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.head_ref }}
           submodules: true

.github/workflows/test_backend.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - name: Cache local Maven repository
@@ -52,7 +52,7 @@ jobs:
           - name: SQL based Integration Tests
             flags: -Dgroups="INTEGRATION_SQL_BACKEND"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: true
       - name: Cache local Maven repository