Skip to content

Commit 388b472

Browse files
committed
use install_modules helper
1 parent e4bcf22 commit 388b472

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ jobs:
6666
key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
6767
- name: Install all modules using Java 11
6868
shell: bash
69-
run: |
70-
mvn -V -B -ntp clean install -DskipTests -Dfmt.skip -Dclirr.skip -Denforcer.skip -Dcheckstyle.skip -Dflatten.skip -Danimal-sniffer.skip -Djacoco.skip
71-
working-directory: sdk-platform-java
69+
run: .kokoro/build.sh
70+
env:
71+
JOB_TYPE: install
7272
- uses: actions/setup-java@v4
7373
with:
7474
java-version: 8
@@ -159,9 +159,10 @@ jobs:
159159
key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
160160
- name: Install all modules using Java 11
161161
shell: bash
162-
run: |
163-
mvn -V -B -ntp clean install -DskipTests -Dfmt.skip -Dclirr.skip -Denforcer.skip -Dcheckstyle.skip -Dflatten.skip -Danimal-sniffer.skip -Djacoco.skip
164-
working-directory: sdk-platform-java
162+
run: .kokoro/build.sh
163+
env:
164+
BUILD_SUBDIR: ${{matrix.package}}
165+
JOB_TYPE: install
165166
- uses: actions/setup-java@v4
166167
with:
167168
java-version: ${{matrix.java}}
@@ -179,6 +180,7 @@ jobs:
179180
-Dflatten.skip=true \
180181
-Danimal.sniffer.skip=true \
181182
-Dmaven.wagon.http.retryHandler.count=5 \
183+
--also-make \
182184
-T 1C
183185
env:
184186
BUILD_SUBDIR: ${{matrix.package}}

.kokoro/build.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,25 @@ case ${JOB_TYPE} in
7171
fi
7272
echo "Finished running unit tests"
7373
;;
74+
install)
75+
if [[ -n "${BUILD_SUBDIR}" ]]
76+
then
77+
echo "Compiling and building all modules for ${BUILD_SUBDIR}"
78+
install_modules "${BUILD_SUBDIR}"
79+
else
80+
mvn install \
81+
-B -ntp \
82+
-Dorg.slf4j.simpleLogger.showDateTime=true \
83+
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
84+
-Dclirr.skip=true \
85+
-Denforcer.skip=true \
86+
-Dcheckstyle.skip=true \
87+
-Dflatten.skip=true \
88+
-Danimal.sniffer.skip=true \
89+
-Dmaven.wagon.http.retryHandler.count=5 \
90+
-DskipTests=true
91+
fi
92+
;;
7493
integration)
7594
generate_modified_modules_list
7695
if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then

0 commit comments

Comments
 (0)