From 21fa0d3ca1040b29ed481dd808ec68607118d52c Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 04:32:38 +0900 Subject: [PATCH 01/11] Fix publish-dry-run.yml --- .github/workflows/publish-dry-run.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index e870603..34bff09 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -1,6 +1,7 @@ name: publish-dry-run on: + workflow_call: workflow_dispatch: jobs: From c268572ff54e27f22244acb80f87931fe25f77c0 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 04:36:37 +0900 Subject: [PATCH 02/11] Downgrade formatter-maven-plugin to support JDK8 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0414b69..92f17f7 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,8 @@ net.revelc.code.formatter formatter-maven-plugin - 2.22.0 + + 2.16.0 ${project.basedir}/eclipse-java-google-style.xml ${project.build.sourceEncoding} From 4542e0dd3637cec35e2c71d96db21bc3b10356c0 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 04:47:50 +0900 Subject: [PATCH 03/11] Fix publish-dry-run.yml and publish.yml --- .github/workflows/publish-dry-run.yml | 9 ++++++--- .github/workflows/publish.yml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index 34bff09..144f02c 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -20,11 +20,14 @@ jobs: java-version: 8 distribution: temurin cache: maven - - name: setup-gpg - run: 'echo -n "${{secrets.MAVEN_GPG_PRIVATE_KEY}}" | base64 --decode | gpg --batch --import' + server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml + server-username: MAVEN_USERNAME # env variable for username in deploy + server-password: MAVEN_PASSWORD # env variable for token in deploy + gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: publish-dry-run env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} - MAVEN_TOKEN: ${{secrets.MAVEN_TOKEN}} + MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}} MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} run: mvn deploy -P release --batch-mode --settings .settings.xml -DskipTests=true -DperformRelease=false -Dmaven.deploy.skip=true --update-snapshots -B -V diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6f15938..2c4dd1b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,11 +27,14 @@ jobs: java-version: 8 distribution: temurin cache: maven - - name: setup-gpg - run: 'echo -n "${{secrets.MAVEN_GPG_PRIVATE_KEY}}" | base64 --decode | gpg --batch --import' + server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml + server-username: MAVEN_USERNAME # env variable for username in deploy + server-password: MAVEN_PASSWORD # env variable for token in deploy + gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: publish env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} - MAVEN_TOKEN: ${{secrets.MAVEN_TOKEN}} + MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}} MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} run: mvn deploy -P release --batch-mode --settings .settings.xml -DperformRelease=false --update-snapshots -B -V From 036997217440a35b7b92d070e47e7a86524cc5bc Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 04:57:34 +0900 Subject: [PATCH 04/11] Use crazy-max/ghaction-import-gpg --- .github/workflows/publish-dry-run.yml | 10 +++++----- .github/workflows/publish.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index 144f02c..4cbde96 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -20,11 +20,11 @@ jobs: java-version: 8 distribution: temurin cache: maven - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - server-username: MAVEN_USERNAME # env variable for username in deploy - server-password: MAVEN_PASSWORD # env variable for token in deploy - gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + - name: setup-gpg + uses: crazy-max/ghaction-import-gpg@v5 + with: + gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} + passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - name: publish-dry-run env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2c4dd1b..3717517 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,11 +27,11 @@ jobs: java-version: 8 distribution: temurin cache: maven - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - server-username: MAVEN_USERNAME # env variable for username in deploy - server-password: MAVEN_PASSWORD # env variable for token in deploy - gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + - name: setup-gpg + uses: crazy-max/ghaction-import-gpg@v5 + with: + gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} + passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - name: publish env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} From ad484ba7259adafa4bb4e89cb1ea6a5220f9f3c6 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 05:19:29 +0900 Subject: [PATCH 05/11] Fix ghaction-import-gpg input name --- .github/workflows/publish-dry-run.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index 4cbde96..55c465e 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -23,7 +23,7 @@ jobs: - name: setup-gpg uses: crazy-max/ghaction-import-gpg@v5 with: - gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} + gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - name: publish-dry-run env: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3717517..6eee609 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: - name: setup-gpg uses: crazy-max/ghaction-import-gpg@v5 with: - gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} + gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - name: publish env: From 1cd02b8a094b98758f418984a17938a4ca42561a Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 05:22:34 +0900 Subject: [PATCH 06/11] Revert "Fix ghaction-import-gpg input name" This reverts commit ad484ba7259adafa4bb4e89cb1ea6a5220f9f3c6. --- .github/workflows/publish-dry-run.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index 55c465e..4cbde96 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -23,7 +23,7 @@ jobs: - name: setup-gpg uses: crazy-max/ghaction-import-gpg@v5 with: - gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} + gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - name: publish-dry-run env: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6eee609..3717517 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: - name: setup-gpg uses: crazy-max/ghaction-import-gpg@v5 with: - gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} + gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - name: publish env: From 57d1c3ee720c6b28946c6b5667970ef026c9b3ea Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 05:30:44 +0900 Subject: [PATCH 07/11] Stop running publish-dry-run on build --- .github/workflows/build.yml | 3 --- .github/workflows/publish-dry-run.yml | 5 ++++- .github/workflows/publish.yml | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40391e7..00e3d94 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,6 +49,3 @@ jobs: cache: maven - name: verify-${{matrix.name}} run: mvn verify --settings .settings.xml -Dgpg.skip -B -V - publish-dry-run: - name: publish-dry-run - uses: ./.github/workflows/publish-dry-run.yml diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index 4cbde96..713c5c5 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -1,7 +1,10 @@ name: publish-dry-run on: - workflow_call: + push: + branches: + - main + - develop workflow_dispatch: jobs: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3717517..1ab8c62 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,8 +12,6 @@ jobs: uses: ./.github/workflows/publish-dry-run.yml publish: name: publish - needs: - - publish-dry-run runs-on: ubuntu-latest permissions: contents: write From e80d4db3894ad1d81bfc3be1167f53933057fd89 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 05:33:30 +0900 Subject: [PATCH 08/11] Fix wrong server ID at .settings.xml --- .settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.settings.xml b/.settings.xml index 5f67b14..6c62448 100644 --- a/.settings.xml +++ b/.settings.xml @@ -2,7 +2,7 @@ - maven + ossrh ${env.MAVEN_USERNAME} ${env.MAVEN_TOKEN} From 1d6ffeac9f667aa24bface6aefbded4e8d2a4478 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 05:52:32 +0900 Subject: [PATCH 09/11] Specify GPG key name. Fix variable name. --- .github/workflows/publish-dry-run.yml | 1 + .github/workflows/publish.yml | 1 + .settings.xml | 2 +- pom.xml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml index 713c5c5..639a8d5 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/publish-dry-run.yml @@ -32,5 +32,6 @@ jobs: env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}} + MAVEN_GPG_KEYNAME: ${{secrets.MAVEN_GPG_KEYNAME}} MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} run: mvn deploy -P release --batch-mode --settings .settings.xml -DskipTests=true -DperformRelease=false -Dmaven.deploy.skip=true --update-snapshots -B -V diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1ab8c62..11a85fa 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,5 +34,6 @@ jobs: env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}} + MAVEN_GPG_KEYNAME: ${{secrets.MAVEN_GPG_KEYNAME}} MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} run: mvn deploy -P release --batch-mode --settings .settings.xml -DperformRelease=false --update-snapshots -B -V diff --git a/.settings.xml b/.settings.xml index 6c62448..fad7e70 100644 --- a/.settings.xml +++ b/.settings.xml @@ -4,7 +4,7 @@ ossrh ${env.MAVEN_USERNAME} - ${env.MAVEN_TOKEN} + ${env.MAVEN_PASSWORD} gpg.passphrase diff --git a/pom.xml b/pom.xml index 92f17f7..27c6ffb 100644 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,7 @@ sign + ${env.MAVEN_GPG_KEYNAME} --pinentry-mode From 2c262b663cc5c62b136d56ccb1ec351d49773989 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 06:05:49 +0900 Subject: [PATCH 10/11] Rename publish-dry-run to package --- .github/workflows/{publish-dry-run.yml => package.yml} | 10 +++++----- .github/workflows/publish.yml | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) rename .github/workflows/{publish-dry-run.yml => package.yml} (76%) diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/package.yml similarity index 76% rename from .github/workflows/publish-dry-run.yml rename to .github/workflows/package.yml index 639a8d5..0516007 100644 --- a/.github/workflows/publish-dry-run.yml +++ b/.github/workflows/package.yml @@ -1,4 +1,4 @@ -name: publish-dry-run +name: package on: push: @@ -8,8 +8,8 @@ on: workflow_dispatch: jobs: - publish-dry-run: - name: publish-dry-run + package: + name: package runs-on: ubuntu-latest permissions: contents: write @@ -28,10 +28,10 @@ jobs: with: gpg_private_key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} passphrase: ${{secrets.MAVEN_GPG_PASSPHRASE}} - - name: publish-dry-run + - name: package env: MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}} MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}} MAVEN_GPG_KEYNAME: ${{secrets.MAVEN_GPG_KEYNAME}} MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} - run: mvn deploy -P release --batch-mode --settings .settings.xml -DskipTests=true -DperformRelease=false -Dmaven.deploy.skip=true --update-snapshots -B -V + run: mvn package -P release --batch-mode --settings .settings.xml -DskipTests=true -DperformRelease=false -Dmaven.deploy.skip=true --update-snapshots -B -V diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 11a85fa..e446244 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: publish-dry-run +name: publish on: release: @@ -7,9 +7,6 @@ on: workflow_dispatch: jobs: - publish-dry-run: - name: publish-dry-run - uses: ./.github/workflows/publish-dry-run.yml publish: name: publish runs-on: ubuntu-latest From 7e17cedfac386202d71e12bae4fad6558abf7a39 Mon Sep 17 00:00:00 2001 From: azam Date: Fri, 14 Apr 2023 06:18:07 +0900 Subject: [PATCH 11/11] Add artifacts to Github Release --- .github/workflows/publish.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e446244..5f7db7b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,3 +34,10 @@ jobs: MAVEN_GPG_KEYNAME: ${{secrets.MAVEN_GPG_KEYNAME}} MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} run: mvn deploy -P release --batch-mode --settings .settings.xml -DperformRelease=false --update-snapshots -B -V + - name: artifacts + uses: softprops/action-gh-release@v1 + with: + files: | + ulidj-*.pom + ulidj-*.jar + ulidj-*.asc