diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c10f6d7..cfb2914 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-java-version: [11, 17, 21] + java-version: [ 11, 17, 21, 22 ] steps: - uses: actions/checkout@v4 @@ -31,19 +31,19 @@ jobs: - name: build distribution env: - MAVEN_CONFIG: "-Dbasepom.check.skip-enforcer=false -B -fae" + MAVEN_ARGS: "-Dbasepom.check.skip-enforcer=false -B -fae" run: | make install-fast - uses: actions/setup-java@v4 id: test_jdk with: - java-version: ${{ matrix.test-java-version }} + java-version: ${{ matrix.java-version }} distribution: temurin cache: maven - name: run tests env: - MAVEN_CONFIG: "-B -fae" + MAVEN_ARGS: "-B -fae" run: | make run-tests diff --git a/.github/workflows/master-cd.yml b/.github/workflows/master-cd.yml index 045fd01..0b47d91 100644 --- a/.github/workflows/master-cd.yml +++ b/.github/workflows/master-cd.yml @@ -29,7 +29,7 @@ jobs: env: NEXUS_REPO_USER: ${{ secrets.NEXUS_REPO_USER }} NEXUS_REPO_PASSWORD: ${{ secrets.NEXUS_REPO_PASSWORD }} - MAVEN_CONFIG: "-B -fae" + MAVEN_ARGS: "-B -fae" run: | make deploy @@ -55,5 +55,6 @@ jobs: - name: publish docs env: SITE_DEPLOY: ${{ secrets.SITE_DEPLOY_TOKEN }} - MAVEN_CONFIG: "-Dbasepom.it.skip=false -B -fae" - run: make deploy-site + MAVEN_ARGS: "-B -fae" + run: | + make deploy-site diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 0ee146d..59d2826 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -28,6 +28,6 @@ jobs: - name: run code checkers env: - MAVEN_CONFIG: "-B -fae" + MAVEN_ARGS: "-B -fae" run: | make install-notests diff --git a/Makefile b/Makefile index ea853e6..a0ade50 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,9 @@ run-tests:: deploy:: ${MAVEN} clean deploy -deploy-site:: - ${MAVEN} clean install site-deploy +deploy-site:: MAVEN_ARGS += -Dbasepom.it.skip=false +deploy-site:: install + ${MAVEN} site-deploy release:: ${MAVEN} clean release:clean release:prepare release:perform