Merge pull request #28 from IABTechLab/tjm-UID2-2281-gcp-component-build

Add the check for a Release to the shared action

Author: thomasm-ttd

.github/workflows/shared-publish-docker-versioned.yaml

@@ -49,25 +49,11 @@ jobs:
       jar_version: ${{ steps.version.outputs.new_version }}
       image_tag: ${{ steps.updatePom.outputs.image_tag }}
     steps:
-      - name: Check if Release
+      - name: Check branch and release type
         id: checkRelease
-        run: |
-            FORCE_RELEASE=${{ inputs.force_release == 'yes' }}
-            FORCE_NOT_RELEASE=${{ inputs.force_release == 'not' }}
-            CHECK_BRANCH_FOR_RELEASE=${{ inputs.force_release == 'branch' }}
-            BRANCH_ALLOWS_RELEASE=${{ (inputs.release_type == 'Major' || inputs.release_type == 'Minor' || inputs.release_type == 'Patch') && (github.event.repository.default_branch == github.ref_name) }}
-            if $FORCE_RELEASE; then
-              ISRELEASE=true
-            elif $FORCE_NOT_RELEASE; then
-              ISRELEASE=false
-            elif ($CHECK_BRANCH_FOR_RELEASE) && ($BRANCH_ALLOWS_RELEASE); then
-              ISRELEASE=true
-            else
-              ISRELEASE=false
-            fi
-            echo "Setting IS_RELEASE to $ISRELEASE"
-            echo "IS_RELEASE=$ISRELEASE" >> $GITHUB_OUTPUT
-            echo "NOT_SNAPSHOT=$BRANCH_ALLOWS_RELEASE" >> $GITHUB_OUTPUT
+        uses: IABTechLab/uid2-shared-actions/actions/[email protected]
+        with:
+          release_type: ${{ inputs.release_type }}
 
       - name: Show Context
         run: |
@@ -77,12 +63,7 @@ jobs:
         env: 
             GITHUB_CONTEXT: ${{ toJson(github) }}
             IS_RELEASE: ${{ steps.checkRelease.outputs.IS_RELEASE }}
-
-      - name: Check branch and release type
-        uses: IABTechLab/uid2-shared-actions/actions/[email protected]
-        with:
-          release_type: ${{ inputs.release_type }}
-
+  
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

actions/check_branch_and_release_type/action.yaml

@@ -4,10 +4,41 @@ inputs:
   release_type:
     description: The type of version number to return. Must be one of [Snapshot, Patch, Minor or Major]
     required: true
+  force_release:
+    description: If 'yes', will force the creation a release, if 'no' will not create a release. 'branch' will use release_type and the branch to determine if a release should be created.
+    default: 'branch'
+outputs:
+  is_release: 
+    description: True if a release should be created
+    value: ${{ steps.checkRelease.outputs.IS_RELEASE }}
+  not_snapshot:
+    description: True if the release type is not a snapshot or pre-release build
+    value: ${{ steps.checkRelease.outputs.NOT_SNAPSHOT }}
 runs:
   using: "composite" 
 
   steps:
+    - name: Check if Release
+      id: checkRelease
+      shell: bash
+      run: |
+          FORCE_RELEASE=${{ inputs.force_release == 'yes' }}
+          FORCE_NOT_RELEASE=${{ inputs.force_release == 'no' }}
+          CHECK_BRANCH_FOR_RELEASE=${{ inputs.force_release == 'branch' }}
+          BRANCH_ALLOWS_RELEASE=${{ (inputs.release_type == 'Major' || inputs.release_type == 'Minor' || inputs.release_type == 'Patch') && (github.event.repository.default_branch == github.ref_name) }}
+          if $FORCE_RELEASE; then
+            ISRELEASE=true
+          elif $FORCE_NOT_RELEASE; then
+            ISRELEASE=false
+          elif ($CHECK_BRANCH_FOR_RELEASE) && ($BRANCH_ALLOWS_RELEASE); then
+            ISRELEASE=true
+          else
+            ISRELEASE=false
+          fi
+          echo "Setting IS_RELEASE to $ISRELEASE"
+          echo "IS_RELEASE=$ISRELEASE" >> $GITHUB_OUTPUT
+          echo "NOT_SNAPSHOT=$BRANCH_ALLOWS_RELEASE" >> $GITHUB_OUTPUT
+
     - name: Fail if Pre-release on Default branch
       if: ${{ inputs.release_type == 'Snapshot' && github.event.repository.default_branch == github.ref_name }}
       uses: actions/github-script@v7