Skip to content

Commit 4f5e375

Browse files
authored
chore: use mvnw for all builds (#592)
1 parent 78049cc commit 4f5e375

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.github/workflows/ci.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ jobs:
194194
ref: ${{ github.event.pull_request.head.sha }}
195195
repository: ${{ github.event.pull_request.head.repo.full_name }}
196196

197-
- name: Setup Maven Action
198-
uses: s4u/setup-maven-action@a37cecafbf1e8d86c1c93d51054a63e228b96b3e
199-
with:
200-
java-version: 17
201-
202197
- name: Set up GraalVM
203198
uses: graalvm/setup-graalvm@22cc13fe88ef133134b3798e128fb208df55e1f5 # v1.2.3
204199
with:
@@ -272,11 +267,6 @@ jobs:
272267
distribution: 'zulu'
273268
java-version: 8
274269

275-
- name: Setup Maven Action
276-
uses: s4u/setup-maven-action@a37cecafbf1e8d86c1c93d51054a63e228b96b3e
277-
with:
278-
java-version: 8
279-
280270
- id: 'auth'
281271
name: Authenticate to Google Cloud
282272
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6

.kokoro/build.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ cd ${scriptDir}/..
2424
source ${scriptDir}/common.sh
2525

2626
# Print out Maven & Java version
27-
mvn -version
27+
./mvnw -version
2828
echo ${JOB_TYPE}
2929

3030
# attempt to install 3 times with exponential backoff (starting with 10 seconds)
3131
retry_with_backoff 3 10 \
32-
mvn install -B -V -ntp \
32+
./mvnw install -B -V -ntp \
3333
-DskipTests=true \
3434
-Dclirr.skip=true \
3535
-Denforcer.skip=true \
@@ -42,19 +42,19 @@ set +e
4242

4343
case ${JOB_TYPE} in
4444
test)
45-
mvn test -B -ntp -Pcoverage -Dclirr.skip=true -Denforcer.skip=true
45+
./mvnw test -B -ntp -Pcoverage -Dclirr.skip=true -Denforcer.skip=true
4646
RETURN_CODE=$?
4747
;;
4848
lint)
49-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
49+
./mvnw com.coveo:fmt-maven-plugin:check -B -ntp
5050
RETURN_CODE=$?
5151
;;
5252
javadoc)
53-
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
53+
./mvnw javadoc:javadoc javadoc:test-javadoc -B -ntp
5454
RETURN_CODE=$?
5555
;;
5656
integration)
57-
mvn -B ${INTEGRATION_TEST_ARGS} \
57+
./mvnw -B ${INTEGRATION_TEST_ARGS} \
5858
-ntp \
5959
-Penable-integration-tests \
6060
-DtrimStackTrace=false \
@@ -66,12 +66,12 @@ integration)
6666
;;
6767
graalvm)
6868
# Run Unit and Integration Tests with Native Image
69-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
69+
./mvnw -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
7070
RETURN_CODE=$?
7171
;;
7272
graalvm17)
7373
# Run Unit and Integration Tests with Native Image
74-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
74+
./mvnw -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
7575
RETURN_CODE=$?
7676
;;
7777
samples)
@@ -90,7 +90,7 @@ samples)
9090
done
9191

9292
pushd ${SAMPLES_DIR}
93-
mvn -B \
93+
./mvnw -B \
9494
-ntp \
9595
-DtrimStackTrace=false \
9696
-Dclirr.skip=true \
@@ -104,7 +104,7 @@ samples)
104104
fi
105105
;;
106106
clirr)
107-
mvn -B -ntp -Denforcer.skip=true clirr:check
107+
./mvnw -B -ntp -Denforcer.skip=true clirr:check
108108
RETURN_CODE=$?
109109
;;
110110
*)

0 commit comments

Comments
 (0)