Skip to content

Commit da8f5fb

Browse files
committed
Improved mvn default argument handling
1 parent f4cbf29 commit da8f5fb

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

‎.github/workflows/continuous-integration.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313

1414
env:
15-
MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
15+
MVN_DEFAULT_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
1616

1717
jobs:
1818

@@ -39,32 +39,32 @@ jobs:
3939
env:
4040
UNIT_TEST_SIGNING_KEY: ${{ vars.UNIT_TEST_SIGNING_KEY }}
4141
- name: Build java-does-usb
42-
run: ./mvnw $MAVEN_ARGS -DskipTests clean install javadoc:javadoc
42+
run: ./mvnw $MVN_DEFAULT_ARGS -DskipTests clean install javadoc:javadoc
4343
working-directory: ./java-does-usb
4444
- name: Determine java-does-usb version
4545
id: libver
46-
run: echo "version=$(./mvnw -q help:evaluate -Dexpression=project.version -DforceStdout | tail -n 1)" >> "$GITHUB_OUTPUT"
46+
run: echo "version=$(./mvnw -q -ntp help:evaluate -Dexpression=project.version -DforceStdout)" >> "$GITHUB_OUTPUT"
4747
working-directory: ./java-does-usb
4848
# Examples pin the latest released version so they double as user-facing documentation;
4949
# override that pin here to compile them against the HEAD version just installed above.
5050
- name: Example "bulk_transfer"
51-
run: ./mvnw $MAVEN_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
51+
run: ./mvnw $MVN_DEFAULT_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
5252
working-directory: ./examples/bulk_transfer
5353
- name: Example "enumerate"
54-
run: ./mvnw $MAVEN_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
54+
run: ./mvnw $MVN_DEFAULT_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
5555
working-directory: ./examples/enumerate
5656
- name: Example "enumerate" (Kotlin)
5757
run: ./gradlew -PjavaDoesUsbVersion=${{ steps.libver.outputs.version }} clean build
5858
working-directory: ./examples/enumerate_kotlin
5959
- name: Example "monitor"
60-
run: ./mvnw $MAVEN_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
60+
run: ./mvnw $MVN_DEFAULT_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
6161
working-directory: ./examples/monitor
6262
- name: Example "monitor" (Kotlin)
63-
run: ./mvnw $MAVEN_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean package
63+
run: ./mvnw $MVN_DEFAULT_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean package
6464
working-directory: ./examples/monitor_kotlin
6565
- name: Example "stm_dfu"
66-
run: ./mvnw $MAVEN_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
66+
run: ./mvnw $MVN_DEFAULT_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
6767
working-directory: ./examples/stm_dfu
6868
- name: Example "epaper_display"
69-
run: ./mvnw $MAVEN_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
69+
run: ./mvnw $MVN_DEFAULT_ARGS -Djava-does-usb.version=${{ steps.libver.outputs.version }} clean compile
7070
working-directory: ./examples/epaper_display

0 commit comments

Comments
 (0)