Skip to content

Commit a4d2dde

Browse files
Merge pull request #34 from IABTechLab/llp-uid2-2236-auto-pr-action
Use a PR-based workflow instead of committing directly to main
2 parents 1f5d1bf + dc7e869 commit a4d2dde

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

.github/workflows/shared-java-publish-versioned-package.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,9 @@ jobs:
8181
run: mvn -B -Drepo.id=ossrh -Drepo.login=${{ secrets.SONATYPE_REPO_ACCOUNT }} -Drepo.pwd="${{ secrets.SONATYPE_REPO_PASSWORD }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}" clean deploy
8282

8383
- name: Commit pom.xml and version.json
84-
uses: EndBug/add-and-commit@v9
84+
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@main
8585
with:
86-
add: 'pom.xml version.json'
87-
author_name: Release Workflow
88-
author_email: [email protected]
86+
add: 'pom.xml,version.json'
8987
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
9088
tag: v${{ steps.version.outputs.new_version }}
9189

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

+4-8
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,16 @@ jobs:
122122
123123
- name: Commit pom.xml and version.json
124124
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE != 'true' }}
125-
uses: EndBug/add-and-commit@v9
125+
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@main
126126
with:
127-
add: 'pom.xml version.json'
128-
author_name: Release Workflow
129-
author_email: [email protected]
127+
add: 'pom.xml,version.json'
130128
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
131129

132130
- name: Commit pom.xml, version.json and set tag
133131
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
134-
uses: EndBug/add-and-commit@v9
132+
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@main
135133
with:
136-
add: 'pom.xml version.json'
137-
author_name: Release Workflow
138-
author_email: [email protected]
134+
add: 'pom.xml,version.json'
139135
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
140136
tag: v${{ steps.version.outputs.new_version }}
141137

.github/workflows/shared-publish-image-aws-ecr.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,9 @@ jobs:
7676
mvn -B compile dependency:copy-dependencies -D"includeScope=runtime"
7777
7878
- name: Commit pom.xml and version.json
79-
uses: EndBug/add-and-commit@v9
79+
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@main
8080
with:
81-
add: 'pom.xml version.json'
82-
author_name: Release Workflow
83-
author_email: [email protected]
81+
add: 'pom.xml,version.json'
8482
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
8583

8684
- name: Extract metadata (tags, labels) for Docker

0 commit comments

Comments
 (0)