sync github builds across all plugins

basepom · Sep 14, 2024 · 3c98202 · 3c98202
1 parent 56a623c
commit 3c98202
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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