diff --git a/.github/workflows/publish-all-operators.yaml b/.github/workflows/publish-all-operators.yaml index f452d431b..b030e5de6 100644 --- a/.github/workflows/publish-all-operators.yaml +++ b/.github/workflows/publish-all-operators.yaml @@ -27,7 +27,8 @@ jobs: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Check branch and release type - uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2.2.2 + id: checkRelease + uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2 with: release_type: ${{ inputs.release_type }} @@ -37,7 +38,7 @@ jobs: fetch-depth: 0 - name: Scan vulnerabilities - uses: IABTechLab/uid2-shared-actions/actions/vulnerability_scan_filesystem@v2.4.0 + uses: IABTechLab/uid2-shared-actions/actions/vulnerability_scan_filesystem@v2 with: scan_severity: HIGH,CRITICAL failure_severity: CRITICAL @@ -57,13 +58,19 @@ jobs: echo "Version number updated from $current_version to $new_version" - name: Commit pom.xml and version.json - uses: EndBug/add-and-commit@v9 + if: ${{ steps.checkRelease.outputs.is_release != 'true' }} + uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2 with: add: 'pom.xml version.json' - author_name: Release Workflow - author_email: unifiedid-admin+release@thetradedesk.com message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}' - tag: v${{ steps.version.outputs.new_version }} + + - name: Commit pom.xml, version.json and set tag + if: ${{ steps.checkRelease.outputs.is_release == 'true' }} + uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2 + with: + add: 'pom.xml version.json' + message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}' + tag: v${{ steps.version.outputs.new_version }} buildPublic: name: Public Operator