Merge pull request #2235 from hgschmie/build-tweaks

Some build tweaks
jdbi · Dec 31, 2022 · c00712a · c00712a
2 parents 54455e6 + 0fdbc20
commit c00712a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
     - name: build distribution
       env:
         JAVA_HOME: ${{ steps.build_jdk.outputs.path }}
-        JDBI_MAVEN_OPTS: "-DskipTests -DskipITs -Dbasepom.check.skip-all=true -Dbasepom.check.skip-enforcer=false -B -fae"
+        JDBI_MAVEN_OPTS: "-Pfast -Dbasepom.check.skip-enforcer=false -B -fae"
       run: |
         ./mvnw --version
         echo $PATH

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -24,12 +24,12 @@ jobs:
 
     - name: build distribution
       env:
-        JDBI_MAVEN_OPTS: "-B -fn"
+        JDBI_MAVEN_OPTS: "-B -fae"
       run: |
         make install-fast
 
     - name: run container tests
       env:
-        JDBI_MAVEN_OPTS: "-B -fn"
+        JDBI_MAVEN_OPTS: "-B -fae"
       run: |
         make tests-container
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -23,7 +23,7 @@ jobs:
 
     - name: run code checkers
       env:
-        JDBI_MAVEN_OPTS: "-DskipITs -DskipTests -B -fae"
+        JDBI_MAVEN_OPTS: "-Dbasepom.test.skip=true -Dbasepom.it.skip=true -B -fae"
       run: |
         ./mvnw --version
         echo $PATH

diff --git a/Makefile b/Makefile
@@ -34,13 +34,13 @@ install-nodocker: install
 install-fast: JDBI_MAVEN_OPTS += -Pfast
 install-fast: install
 
-docs: JDBI_MAVEN_OPTS += -Dbasepom.check.skip-all=true -Dbasepom.javadoc.skip=false -DskipTests=true
+docs: JDBI_MAVEN_OPTS += -Pfast -Dbasepom.javadoc.skip=false
 docs: install
 	${MAVEN} -pl :jdbi3-docs clean install
 
 tests: JDBI_MAVEN_OPTS += -Dbasepom.it.skip=false
 tests:
-	${MAVEN} surefire:test invoker:integration-test invoker:verify
+	${MAVEN} surefire:test invoker:install invoker:integration-test invoker:verify
 
 tests-container: JDBI_MAVEN_OPTS += -Dbasepom.test.skip=false
 tests-container:
@@ -49,7 +49,7 @@ tests-container:
 tests-nodocker: JDBI_MAVEN_OPTS += -Dno-docker
 tests-nodocker: tests
 
-publish-docs: JDBI_MAVEN_OPTS += -Dbasepom.check.skip-all=true -Dbasepom.javadoc.skip=false -DskipTests=true
+publish-docs: JDBI_MAVEN_OPTS += -Pfast -Dbasepom.javadoc.skip=false
 publish-docs: install
 	${MAVEN} -Ppublish-docs -pl :jdbi3-docs clean deploy