Skip to content

Commit 2364fd8

Browse files
authored
Merge branch 'main' into fix-release-check-inheritance
2 parents 06d6a50 + dea45de commit 2364fd8

5 files changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/sdk-platform-java-ci.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,13 @@ jobs:
180180
with:
181181
java-version: 17
182182
distribution: temurin
183-
- name: Compile with Java 17 and run tests with Java 8
183+
- name: Install all modules using Java 17
184+
shell: bash
185+
run: .kokoro/build.sh
186+
env:
187+
BUILD_SUBDIR: sdk-platform-java
188+
JOB_TYPE: install
189+
- name: Run tests with Java 8
184190
shell: bash
185191
run: |
186192
set -x
@@ -192,7 +198,7 @@ jobs:
192198
-Djvm="${JAVA8_HOME}/bin/java"
193199
working-directory: sdk-platform-java
194200
# The `envVarTest` profile runs tests that require an environment variable
195-
- name: Compile with Java 17 and run tests with Java 8 (Env Var Tests)
201+
- name: Run tests with Java 8 (Env Var Tests)
196202
shell: bash
197203
run: |
198204
set -x

.kokoro/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ function install_modules() {
408408
always_install_deps_list=(
409409
'google-auth-library-java/appengine'
410410
'google-auth-library-java/bom'
411+
'google-auth-library-java/cab-token-generator'
411412
'google-auth-library-java/credentials'
412413
'google-auth-library-java/oauth2_http'
413414
'sdk-platform-java/java-shared-dependencies'

sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-dns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-dns</artifactId>
66
<packaging>jar</packaging>
7-
<version>2.33.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
7+
<version>2.33.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns-golden:current} -->
88
<name>Google Cloud DNS Parent</name>
99
</project>

sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-service-control/google-cloud-service-control-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-service-control-bom</artifactId>
6-
<version>1.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-service-control:current} -->
6+
<version>1.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-service-control-golden:current} -->
77
<packaging>pom</packaging>
88
</project>

sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-tasks/google-cloud-tasks-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-tasks-bom</artifactId>
6-
<version>2.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks:current} -->
6+
<version>2.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks-golden:current} -->
77
<packaging>pom</packaging>
88
</project>

0 commit comments

Comments
 (0)