Skip to content

Commit

Permalink
Merge pull request #16424 from famod/fail-at-end
Browse files Browse the repository at this point in the history
CI: Introduce COMMON_MAVEN_ARGS with --fail-at-end
  • Loading branch information
famod authored Apr 11, 2021
2 parents c77a6b5 + a7712ad commit 851ef0a
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ on:
env:
# Workaround testsuite locale issue
LANG: en_US.UTF-8
NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dquarkus.native.container-build=true -Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
WINDOWS_NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
JVM_TEST_MAVEN_OPTS: "-e -B --settings .github/mvn-settings.xml -Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs"
COMMON_MAVEN_ARGS: "-e -B --settings .github/mvn-settings.xml --fail-at-end"
NATIVE_TEST_MAVEN_OPTS: "-Dquarkus.native.container-build=true -Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
WINDOWS_NATIVE_TEST_MAVEN_OPTS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
JVM_TEST_MAVEN_OPTS: "-Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs"
DB_USER: hibernate_orm_test
DB_PASSWORD: hibernate_orm_test
DB_NAME: hibernate_orm_test
Expand Down Expand Up @@ -113,7 +114,7 @@ jobs:
# note: '-Pincremental -Dgib.disable' shall only trigger the download of gitflow-incremental-builder, not activate it
# since -Dincremental deactivates dependencies in bom-descriptor-json (which we do need here), -P is used instead
run: |
mvn -T1C -e -B -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks -Pincremental -Dgib.disable --settings .github/mvn-settings.xml clean install
mvn -T1C $COMMON_MAVEN_ARGS -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks -Pincremental -Dgib.disable clean install
- name: Verify extension dependencies
shell: bash
run: |
Expand Down Expand Up @@ -230,7 +231,7 @@ jobs:
run: tar -xzf maven-repo.tgz -C ~
- name: Build
shell: bash
run: mvn $JVM_TEST_MAVEN_OPTS install -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args }} ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args }} ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -281,7 +282,7 @@ jobs:
run: tar -xzf maven-repo.tgz -C ~
- name: Build
shell: bash
run: mvn -B --settings .github/mvn-settings.xml -DskipDocs -Dformat.skip -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS -DskipDocs -Dformat.skip -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -338,7 +339,7 @@ jobs:
with:
java-version: ${{ matrix.java.java-version }}
- name: Build
run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -388,7 +389,7 @@ jobs:
java-version: 11
- name: Build
shell: bash
run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -465,7 +466,7 @@ jobs:
working-directory: integration-tests/gradle
- name: Build
shell: bash
run: mvn $JVM_TEST_MAVEN_OPTS install -pl integration-tests/gradle ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl integration-tests/gradle ${{ needs.build-jdk11.outputs.gib_args }}
- name: Upload Surefire reports (if build failed)
uses: actions/upload-artifact@v2
if: failure()
Expand Down Expand Up @@ -510,7 +511,7 @@ jobs:
with:
java-version: ${{ matrix.java.java-version }}
- name: Build
run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -560,7 +561,7 @@ jobs:
java-version: 11
- name: Build
shell: bash
run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -622,7 +623,7 @@ jobs:
run: mvn -B --settings ../tcks/.github/mvn-settings.xml install
working-directory: ./resteasy-reactive-testsuite
- name: Verify with Maven
run: mvn -B --settings .github/mvn-settings.xml -Dtcks -pl tcks -amd install ${{ needs.build-jdk11.outputs.gib_args }}
run: mvn $COMMON_MAVEN_ARGS -Dtcks -pl tcks -amd install ${{ needs.build-jdk11.outputs.gib_args }}
working-directory: ./tcks
- name: Prepare failure archive (if maven failed)
if: failure()
Expand Down Expand Up @@ -703,12 +704,12 @@ jobs:
run: |
for i in $TEST_MODULES
do modules+="integration-tests/$i,"; done
mvn -pl "${modules}" $NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }}
mvn $COMMON_MAVEN_ARGS -pl "${modules}" $NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }}
# add the 'simple with spaces' project to the run of 'Misc1' by executing it explicitly
# done because there is no good way to pass strings with empty values to the previous command
# so this hack is as good as any
if [ "$CATEGORY" == "Misc1" ]; then
mvn -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -pl 'integration-tests/simple with space/' verify ${{ needs.build-jdk11.outputs.gib_args }}
mvn $COMMON_MAVEN_ARGS -Dnative -Dquarkus.native.container-build=true -pl 'integration-tests/simple with space/' verify ${{ needs.build-jdk11.outputs.gib_args }}
fi
- name: Prepare failure archive (if maven failed)
if: failure()
Expand Down Expand Up @@ -793,7 +794,7 @@ jobs:
run: |
for i in $TEST_MODULES
do modules+="integration-tests/$i,"; done
mvn -pl "${modules}" $WINDOWS_NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }}
mvn $COMMON_MAVEN_ARGS -pl "${modules}" $WINDOWS_NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down

0 comments on commit 851ef0a

Please sign in to comment.