Skip to content

Commit

Permalink
Merge pull request #17116 from gsmet/use-mvnw
Browse files Browse the repository at this point in the history
Use mvnw in CI to make sure we have a stable Maven version
  • Loading branch information
gsmet authored May 11, 2021
2 parents 7546bb0 + 407748a commit 6b724df
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
key: q2maven-${{ steps.get-date.outputs.date }}
- name: Build
run: |
mvn -e -B -DskipTests -DskipITs -Dno-format --settings .github/mvn-settings.xml clean install
./mvnw -e -B -DskipTests -DskipITs -Dno-format --settings .github/mvn-settings.xml clean install
- name: Tar Maven Repo
shell: bash
run: tar -czf maven-repo.tgz -C ~ .m2/repository
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Build
run: eval mvn $JVM_TEST_MAVEN_OPTS install -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args}}
run: eval ./mvnw $JVM_TEST_MAVEN_OPTS install -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args}}
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
run: tar -xzf maven-repo.tgz -C ~
- name: Build
shell: bash
run: mvn -B --settings .github/mvn-settings.xml -DskipDocs -Dno-native -Dformat.skip -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install
run: ./mvnw -B --settings .github/mvn-settings.xml -DskipDocs -Dno-native -Dformat.skip -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
with:
java-version: ${{ matrix.java.java-version }}
- name: Build
run: eval mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
run: eval ./mvnw $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -325,7 +325,7 @@ jobs:
java-version: 11
- name: Build
shell: bash
run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
run: ./mvnw $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -462,7 +462,7 @@ jobs:
with:
java-version: ${{ matrix.java.java-version }}
- name: Build
run: eval mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
run: eval ./mvnw $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -507,7 +507,7 @@ jobs:
java-version: 11
- name: Build
shell: bash
run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
run: ./mvnw $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -561,10 +561,10 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Run RESTEasy Reactive TCK
run: mvn -B --settings ../tcks/.github/mvn-settings.xml install
run: ./mvnw -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 -f tcks/pom.xml install
run: ./mvnw -B --settings .github/mvn-settings.xml -f tcks/pom.xml install
working-directory: ./tcks
- name: Prepare failure archive (if maven failed)
if: failure()
Expand Down Expand Up @@ -636,12 +636,12 @@ jobs:
for i in $TEST_MODULES
do modules+=("integration-tests/$i"); done
IFS=,
eval mvn -pl "${modules[*]}" $NATIVE_TEST_MAVEN_OPTS
eval ./mvnw -pl "${modules[*]}" $NATIVE_TEST_MAVEN_OPTS
# 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 -f 'integration-tests/simple with space/' verify
./mvnw -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -f 'integration-tests/simple with space/' verify
fi
- name: Prepare failure archive (if maven failed)
if: failure()
Expand Down

0 comments on commit 6b724df

Please sign in to comment.