Skip to content

Commit 77df590

Browse files
committed
fix(java-shared-config): install gapic-generator-java-bom and google-cloud-core-bom during downstream builds
1 parent a21b026 commit 77df590

3 files changed

Lines changed: 24 additions & 10 deletions

File tree

.github/workflows/java-shared-config-downstream-dependencies.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ jobs:
4242
- run: java -version
4343
- run: sudo apt-get update -y
4444
- run: sudo apt-get install libxml2-utils
45-
- name: Install java-shared-dependencies
45+
- name: Install java-shared-dependencies and common dependencies
4646
run: |
47-
mvn install -pl sdk-platform-java/java-shared-dependencies,sdk-platform-java/java-shared-dependencies/first-party-dependencies,sdk-platform-java/java-shared-dependencies/third-party-dependencies -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
47+
.kokoro/build.sh
48+
env:
49+
JOB_TYPE: install
4850
- name: Pre-build dependencies
4951
run: |
5052
LIB_DIR="${{matrix.repo}}"
@@ -65,9 +67,11 @@ jobs:
6567
- run: java -version
6668
- run: sudo apt-get update -y
6769
- run: sudo apt-get install libxml2-utils
68-
- name: Install java-shared-dependencies
70+
- name: Install java-shared-dependencies and common dependencies
6971
run: |
70-
mvn install -pl sdk-platform-java/java-shared-dependencies,sdk-platform-java/java-shared-dependencies/first-party-dependencies,sdk-platform-java/java-shared-dependencies/third-party-dependencies -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
72+
.kokoro/build.sh
73+
env:
74+
JOB_TYPE: install
7175
- name: Pre-build dependencies
7276
run: mvn install -pl java-storage/google-cloud-storage -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
7377
- run: .kokoro/client-library-check.sh java-storage flatten-plugin

.github/workflows/java-shared-config-downstream-maven-plugins.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ jobs:
4545
with:
4646
distribution: zulu
4747
java-version: 11
48-
- name: Install java-shared-dependencies
48+
- name: Install java-shared-dependencies and common dependencies
4949
run: |
50-
mvn install -pl sdk-platform-java/java-shared-dependencies,sdk-platform-java/java-shared-dependencies/first-party-dependencies,sdk-platform-java/java-shared-dependencies/third-party-dependencies -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
50+
.kokoro/build.sh
51+
env:
52+
JOB_TYPE: install
5153
- name: Pre-build dependencies
5254
run: |
5355
LIB_DIR="${{matrix.repo}}"
@@ -85,9 +87,11 @@ jobs:
8587
- run: java -version
8688
- run: sudo apt-get update -y
8789
- run: sudo apt-get install libxml2-utils
88-
- name: Install java-shared-dependencies
90+
- name: Install java-shared-dependencies and common dependencies
8991
run: |
90-
mvn install -pl sdk-platform-java/java-shared-dependencies,sdk-platform-java/java-shared-dependencies/first-party-dependencies,sdk-platform-java/java-shared-dependencies/third-party-dependencies -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
92+
.kokoro/build.sh
93+
env:
94+
JOB_TYPE: install
9195
- name: Pre-build dependencies
9296
run: |
9397
LIB_DIR="${{matrix.repo}}"
@@ -124,9 +128,11 @@ jobs:
124128
- run: java -version
125129
- run: sudo apt-get update -y
126130
- run: sudo apt-get install libxml2-utils
127-
- name: Install java-shared-dependencies
131+
- name: Install java-shared-dependencies and common dependencies
128132
run: |
129-
mvn install -pl sdk-platform-java/java-shared-dependencies,sdk-platform-java/java-shared-dependencies/first-party-dependencies,sdk-platform-java/java-shared-dependencies/third-party-dependencies -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
133+
.kokoro/build.sh
134+
env:
135+
JOB_TYPE: install
130136
- name: Pre-build dependencies
131137
run: |
132138
LIB_DIR="${{matrix.repo}}"

.kokoro/common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,8 @@ function install_modules() {
406406
-Dorg.slf4j.simpleLogger.showDateTime=true \
407407
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
408408
-DskipTests=true \
409+
-Dmaven.javadoc.skip=true \
410+
-Dgcloud.download.skip=true \
409411
-T 1C
410412
else
411413
printf "Installing modules:\n%s\n" "$1"
@@ -473,6 +475,8 @@ function install_modules() {
473475
-Dorg.slf4j.simpleLogger.showDateTime=true \
474476
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
475477
-DskipTests=true \
478+
-Dmaven.javadoc.skip=true \
479+
-Dgcloud.download.skip=true \
476480
-T 1C
477481
fi
478482
}

0 commit comments

Comments
 (0)