Merge branch 'master' into #1360-api-docs-reference-resolution

membrane · Dec 19, 2024 · 7c1164b · 7c1164b
2 parents fc86d2d + a7cb21d
commit 7c1164b
Show file tree

Hide file tree

Showing 251 changed files with 8,231 additions and 3,772 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -36,6 +36,8 @@ jobs:
           output_name: tag
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
 
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -7,6 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -5,6 +5,10 @@ on:
       - closed
     branches:
       - master
+      - 7**
+      - 6**
+      - 5**
+      - 4**
 jobs:
   build-release:
     if: github.event.pull_request.merged && startsWith(github.event.pull_request.title, 'Release ')
@@ -19,6 +23,8 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
       - id: compile-membrane
         name: Compile Membrane
         run: |
@@ -38,13 +44,15 @@ jobs:
           cd ..
       - name: Create Pull Request for next Snapshot
         id: cpr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: "Snapshot version"
           title: "Snapshot version"
           author: "github-actions <[email protected]>"
           body: "Update all project `pom.xml` and related files to post-${{ steps.get_version.outputs.VERSION }} snapshot version"
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
       - id: install-secret-key
         name: Install gpg secret key
         run: |
@@ -71,7 +79,7 @@ jobs:
         with:
           name: v${{ steps.get_version.outputs.VERSION }}
           tag: ${{ github.head_ref }}
-          commit: "master"
+          commit: ${{ github.event.pull_request.merge_commit_sha }}
           prerelease: true
 #          makeLatest: true
           bodyFile: "distribution/release-notes/${{ steps.get_version.outputs.VERSION }}.md"

diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -3,6 +3,11 @@ name: Pull Request for Release
 on:
   workflow_dispatch:
     inputs:
+      branch:
+        description: Branch to be used as base (e.g. master, e.g. 5.5.X)
+        type: string
+        default: 'master'
+        required: true
       version:
         description: Version Number of release to be created (e.g. 1.2.3)
         type: string
@@ -18,6 +23,8 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
       - id: compile-membrane
         name: Compile Membrane
         run: |
@@ -38,7 +45,7 @@ jobs:
           cd ..
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           branch: v${{ github.event.inputs.version }}
           commit-message: "Release ${{ github.event.inputs.version }}"