Change release check (#919)

Author: toondaey

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
     pull_request:
         branches:
         - master
-        - release-*.*
+        - release-2.x
 
 jobs:
     common:

.github/workflows/common.yml

@@ -18,6 +18,9 @@ on:
             rpmver:
                 description: Version to tag RPM with
                 value: ${{ jobs.prerequisites.outputs.rpmver }}
+            is-release-branch:
+                description: A string boolean indicating if the current branch is a release branch
+                value: ${{ jobs.prerequisites.outputs.is-release-branch }}
         secrets:
             ARTIFACTORY_READONLY_TOKEN_USER_PUBLIC_REPOS:
                 required: true
@@ -33,8 +36,9 @@ jobs:
             version: ${{ steps.get-version.outputs.version }}
             args: ${{ steps.get-pub-args.outputs.args }}
             rpmver: ${{ steps.rpmver.outputs.rpmver }}
+            is-release-branch: ${{ steps.is-release-branch.outputs.match }}
         steps:
-          - name: checkout master
+          - name: checkout branch
             uses: actions/checkout@v6
             with:
                 fetch-depth: 0
@@ -54,13 +58,25 @@ jobs:
             id: current-branch
             run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> "$GITHUB_OUTPUT"
 
+          - name: Is release branch
+            id: is-release-branch
+            run: |
+              if [[ "${{ steps.current-branch.outputs.branch }}" =~ ^(master|release-[[:digit:]]+\.x)$ ]]; then
+                echo "::notice::This branch will create a new release"
+                echo "match=true" >> $GITHUB_OUTPUT
+
+              else
+                echo "::notice::This branch will not create a new release"
+                echo "match=false" >> $GITHUB_OUTPUT
+              fi;
+
           - name: Confirm release
             id: confirm-release
             run: echo "test=$(git tag --list 'v${{ steps.get-version.outputs.version }}' | wc -l | sed s/\ //g)" >> $GITHUB_OUTPUT
 
           - name: Get RPM version
             id: rpmver
-            run: echo "rpmver=$(echo "${{ steps.get-version.outputs.version}}" | tr - _)" >> "$GITHUB_OUTPUT"
+            run: echo "rpmver=$(echo "${{ steps.get-version.outputs.version }}" | tr - _)" >> "$GITHUB_OUTPUT"
 
           - name: Message about build
             uses: actions/github-script@v8
@@ -74,7 +90,7 @@ jobs:
 
     build-windows-installer:
         runs-on: windows-2022
-        environment: ${{ needs.prerequisites.outputs.branch == 'master' && 'CD' || 'CI' }}
+        environment: ${{ needs.prerequisites.outputs.is-release-branch == 'true' && 'CD' || 'CI' }}
         needs: prerequisites
 
         steps:
@@ -93,7 +109,7 @@ jobs:
             run: dotnet publish -c Release -r win-x64 ${{ needs.prerequisites.outputs.args }} .\ExtractorLauncher\ -o extractorbuild\
 
           - name: Sign executable
-            if: ${{ needs.prerequisites.outputs.branch == 'master' }}
+            if: ${{ needs.prerequisites.outputs.is-release-branch == 'true' }}
             env:
                 CERTIFICATE_HOST: ${{ secrets.CODE_SIGNING_CERT_HOST }}
                 CERTIFICATE_HOST_API_KEY: ${{ secrets.CODE_SIGNING_CERT_HOST_API_KEY }}
@@ -114,7 +130,7 @@ jobs:
           - run: xcopy OpcUaServiceManager\bin\Release managerbuild /S /Y
 
           - name: Sign manager
-            if: ${{ needs.prerequisites.outputs.branch == 'master' }}
+            if: ${{ needs.prerequisites.outputs.is-release-branch == 'true' }}
             env:
                 CERTIFICATE_HOST: ${{ secrets.CODE_SIGNING_CERT_HOST }}
                 CERTIFICATE_HOST_API_KEY: ${{ secrets.CODE_SIGNING_CERT_HOST_API_KEY }}
@@ -134,7 +150,7 @@ jobs:
             run: .\build.ps1 -v ${{ needs.prerequisites.outputs.version }} -b msbuild -d "OPC-UA Extractor" -c .\setup-config.json
 
           - name: Sign MSI
-            if: ${{ needs.prerequisites.outputs.branch == 'master' }}
+            if: ${{ needs.prerequisites.outputs.is-release-branch == 'true' }}
             env:
                 CERTIFICATE_HOST: ${{ secrets.CODE_SIGNING_CERT_HOST }}
                 CERTIFICATE_HOST_API_KEY: ${{ secrets.CODE_SIGNING_CERT_HOST_API_KEY }}
@@ -150,7 +166,7 @@ jobs:
 
           - name: Upload artifacts
             uses: actions/upload-artifact@v6
-            if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.branch == 'master' }}
+            if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.is-release-branch == 'true' }}
             with:
                 name: installer
                 path: .\OpcUaExtractorSetup-${{ needs.prerequisites.outputs.version }}.msi
@@ -209,7 +225,7 @@ jobs:
           - run: ./build-zip-server.sh linux-x64 true ${{ needs.prerequisites.outputs.version }}
 
           - name: Move artifacts to separate folder
-            if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.branch == 'master' }}
+            if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.is-release-branch == 'true' }}
             run: |
               mkdir artifacts
               mv ./opcua-extractor.win-x64.${{ needs.prerequisites.outputs.version }}.zip artifacts/
@@ -223,15 +239,15 @@ jobs:
 
           - name: Upload artifacts
             uses: actions/upload-artifact@v6
-            if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.branch == 'master' }}
+            if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.is-release-branch == 'true' }}
             with:
               name: linux-artifacts
               path: artifacts/
               retention-days: 1
 
     build-docker:
         runs-on: ubuntu-latest
-        environment: ${{ needs.prerequisites.outputs.branch == 'master' && 'CD' || 'CI' }}
+        environment: ${{ needs.prerequisites.outputs.is-release-branch == 'true' && 'CD' || 'CI' }}
         needs: prerequisites
 
         steps:
@@ -271,14 +287,14 @@ jobs:
             image: docker.io/${{ steps.image_tags.outputs.bridge_dockerhub }}
 
         - name: "Log in to the Dockerhub"
-          if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.branch == 'master' }}
+          if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.is-release-branch == 'true' }}
           uses: docker/login-action@v3
           with:
             username: ${{ secrets.DOCKERHUB_USER }}
             password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
 
         - name: Push images dockerhub
-          if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.branch == 'master' }}
+          if: ${{ needs.prerequisites.outputs.should-release == 0 && needs.prerequisites.outputs.is-release-branch == 'true' }}
           run: |
             echo "Images being pushed as ${{ steps.image_tags.outputs.extractor_dockerhub }}, ${{ steps.image_tags.outputs.bridge_dockerhub }}"
             docker push ${{ steps.image_tags.outputs.extractor_dockerhub }}

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
     push:
         branches:
         - master
-        - release-*.*
+        - release-2.x
 
 jobs:
     common:

.github/workflows/test.yml

@@ -5,11 +5,11 @@ on:
         secrets:
             CODECOV_TOKEN:
                 required: true
-    
+
 jobs:
     build:
         runs-on: ubuntu-latest
-        
+
         steps:
         - uses: actions/checkout@v6
         - name: Setup .NET