From 7ef444e8ec55c11f936b77ae61035f625793d548 Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 13 Aug 2024 10:19:58 +0100 Subject: [PATCH 1/2] Use consistent `mvn` arguments Use the same options - e.g. `--no-transfer-progress` - for all commands. --- .github/workflows/do-release.yml | 9 +++++---- .github/workflows/pr-builder.yaml | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/do-release.yml b/.github/workflows/do-release.yml index 3e2ef24..c842924 100644 --- a/.github/workflows/do-release.yml +++ b/.github/workflows/do-release.yml @@ -35,15 +35,16 @@ jobs: - name: Do the Deployment and related stuff run: | - mvn versions:set -B -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }} + mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }} git commit -am "Release ${{ github.event.inputs.release-version }}" git tag v${{ github.event.inputs.release-version }} - mvn clean install -B - mvn deploy -B -Prelease -DskipTests - mvn versions:set -B -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.next-snapshot-version }} + mvn clean install + mvn deploy -Prelease -DskipTests + mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.next-snapshot-version }} git commit -am "Next version is ${{ github.event.inputs.next-snapshot-version }}" git push origin v${{ github.event.inputs.release-version }} main env: + MAVEN_OPTS: --batch-mode --no-transfer-progress --errors MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.github/workflows/pr-builder.yaml b/.github/workflows/pr-builder.yaml index 95e50f6..1517068 100644 --- a/.github/workflows/pr-builder.yaml +++ b/.github/workflows/pr-builder.yaml @@ -20,5 +20,7 @@ jobs: cache: 'maven' - name: Maven, now you do the magic! I enchant you the Bash way! run: | - mvn --batch-mode --update-snapshots install - mvn --batch-mode -Prun-its verify -DskipTests + mvn install + mvn -Prun-its verify -DskipTests + env: + MAVEN_OPTS: --batch-mode --no-transfer-progress --errors From 86936e1b32778fa82ee9571611fa56538318757b Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 13 Aug 2024 10:21:55 +0100 Subject: [PATCH 2/2] Fix --- .github/workflows/do-release.yml | 2 +- .github/workflows/pr-builder.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/do-release.yml b/.github/workflows/do-release.yml index c842924..8621a8c 100644 --- a/.github/workflows/do-release.yml +++ b/.github/workflows/do-release.yml @@ -44,7 +44,7 @@ jobs: git commit -am "Next version is ${{ github.event.inputs.next-snapshot-version }}" git push origin v${{ github.event.inputs.release-version }} main env: - MAVEN_OPTS: --batch-mode --no-transfer-progress --errors + MAVEN_ARGS: --batch-mode --no-transfer-progress --errors MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.github/workflows/pr-builder.yaml b/.github/workflows/pr-builder.yaml index 1517068..dd2a702 100644 --- a/.github/workflows/pr-builder.yaml +++ b/.github/workflows/pr-builder.yaml @@ -23,4 +23,4 @@ jobs: mvn install mvn -Prun-its verify -DskipTests env: - MAVEN_OPTS: --batch-mode --no-transfer-progress --errors + MAVEN_ARGS: --batch-mode --no-transfer-progress --errors