From 6ae8d69973d2d60b2f86f6ed5b1c739eccbd970b Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:28:43 +0100 Subject: [PATCH 1/9] github/build: verify javadoc validity --- .github/workflows/build-maven.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index 0da4ffc..d14560a 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -13,7 +13,6 @@ jobs: matrix: java: [ 8, 11, 15 ] steps: - - uses: kamiazya/setup-graphviz@v1 - uses: actions/checkout@v2 - name: setup-jdk-${{ matrix.java }} uses: actions/setup-java@v1 @@ -21,3 +20,5 @@ jobs: java-version: ${{ matrix.java }} - name: build-jar run: mvn -B install + - name: verify javadoc + run: mvn -P release javadoc:javadoc From d3d83e0732a57d3a296a608d56ce0debfb46f4f9 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:31:14 +0100 Subject: [PATCH 2/9] github/build: stop testing against JDK 8 --- .github/workflows/build-maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index d14560a..3ebfc84 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 8, 11, 15 ] + java: [ 11, 15 ] steps: - uses: actions/checkout@v2 - name: setup-jdk-${{ matrix.java }} From 16859527af3214d973e8b7075e778b12eedc53f9 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:31:49 +0100 Subject: [PATCH 3/9] github/build: test against JDK 16 and 17-ea Drop testing against JDK 15 --- .github/workflows/build-maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index 3ebfc84..122e078 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 11, 15 ] + java: [ 11, 16, 17-ea ] steps: - uses: actions/checkout@v2 - name: setup-jdk-${{ matrix.java }} From 9547a9f97591849b59a60f90b816392f45f96128 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:32:35 +0100 Subject: [PATCH 4/9] github/deploy: remove graphviz --- .github/workflows/deploy-sonatype.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-sonatype.yml b/.github/workflows/deploy-sonatype.yml index ea469cb..9ab206b 100644 --- a/.github/workflows/deploy-sonatype.yml +++ b/.github/workflows/deploy-sonatype.yml @@ -9,7 +9,6 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: kamiazya/setup-graphviz@v1 - uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 From 0a8ea437718cea0b9fe3962db20c5e415db49d68 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:33:20 +0100 Subject: [PATCH 5/9] github.deploy: nexus username is not a secret --- .github/workflows/deploy-sonatype.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-sonatype.yml b/.github/workflows/deploy-sonatype.yml index 9ab206b..284471d 100644 --- a/.github/workflows/deploy-sonatype.yml +++ b/.github/workflows/deploy-sonatype.yml @@ -33,7 +33,6 @@ jobs: -B \ deploy env: - NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} From c6dcb777b525f55e9be300b3b775c2c68700fada Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:33:58 +0100 Subject: [PATCH 6/9] github/settings: nexus username is not a secret --- .github/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/settings.xml b/.github/settings.xml index 8791e47..6e198f7 100644 --- a/.github/settings.xml +++ b/.github/settings.xml @@ -3,12 +3,12 @@ sonatype-nexus-snapshots - ${env.NEXUS_USERNAME} + kemitix ${env.NEXUS_PASSWORD} sonatype-nexus-staging - ${env.NEXUS_USERNAME} + kemitix ${env.NEXUS_PASSWORD} From 3904aa6bb1ba63b4ec7237db9ccf6fe09e1aefba Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:35:26 +0100 Subject: [PATCH 7/9] github/deploy: publish javadoc To: https://kemitix.github.io/wiser-assertions/ --- .github/workflows/deploy-sonatype.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/deploy-sonatype.yml b/.github/workflows/deploy-sonatype.yml index 284471d..8cb5b6b 100644 --- a/.github/workflows/deploy-sonatype.yml +++ b/.github/workflows/deploy-sonatype.yml @@ -36,3 +36,8 @@ jobs: NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + - name: Publish Javadoc + uses: JamesIves/github-pages-deploy-action@4.1.4 + with: + branch: gh-pages # The branch the action should deploy to. + folder: target/apidocs # The folder the action should deploy. From ef520987b208242569ed4ea61ade7e454a1bfe26 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:38:10 +0100 Subject: [PATCH 8/9] github/build: upgrade setup-java action to 2.1.0 --- .github/workflows/build-maven.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index 122e078..4d98266 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -15,8 +15,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup-jdk-${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2.1.0 with: + distribution: adopt java-version: ${{ matrix.java }} - name: build-jar run: mvn -B install From c96cb24f76d61811ccabf65b131c7bbf0724a6e6 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 6 Aug 2021 10:39:50 +0100 Subject: [PATCH 9/9] github/deploy: upgrade setup-java action to 2.1.0 --- .github/workflows/deploy-sonatype.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sonatype.yml b/.github/workflows/deploy-sonatype.yml index 8cb5b6b..6cf1980 100644 --- a/.github/workflows/deploy-sonatype.yml +++ b/.github/workflows/deploy-sonatype.yml @@ -11,8 +11,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2.1.0 with: + distribution: adopt java-version: 8 - name: Build with Maven run: mvn -B install