Skip to content

Commit 9fe11d9

Browse files
chore: remove obsolete kokoro configs and update DocFX profile (#1934)
* chore: update DocFx profile * remove obsolete kokoro configs * πŸ¦‰ Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * remove ci.yaml from owlbot post-processing * remove 21 from matrix * fix dependencies script * πŸ¦‰ Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update dependencies * fix major version format * remove 21 from testing --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 53eb6a1 commit 9fe11d9

22 files changed

+35
-1076
lines changed

β€Ž.github/workflows/ci.yaml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131
- uses: actions/setup-java@v3
3232
with:
33-
distribution: zulu
33+
distribution: temurin
3434
java-version: ${{matrix.java}}
3535
- run: java -version
3636
- run: .kokoro/build.sh
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v3
4545
- uses: actions/setup-java@v3
4646
with:
47-
distribution: zulu
47+
distribution: temurin
4848
java-version: 8
4949
- run: java -version
5050
- run: .kokoro/build.bat
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@v3
6060
- uses: actions/setup-java@v3
6161
with:
62-
distribution: zulu
62+
distribution: temurin
6363
java-version: ${{matrix.java}}
6464
- run: java -version
6565
- run: .kokoro/dependencies.sh
@@ -69,7 +69,7 @@ jobs:
6969
- uses: actions/checkout@v3
7070
- uses: actions/setup-java@v3
7171
with:
72-
distribution: zulu
72+
distribution: temurin
7373
java-version: 11
7474
- run: java -version
7575
- run: .kokoro/build.sh
@@ -81,33 +81,33 @@ jobs:
8181
- uses: actions/checkout@v3
8282
- uses: actions/setup-java@v3
8383
with:
84-
distribution: zulu
84+
distribution: temurin
8585
java-version: 8
8686
- run: java -version
8787
- run: .kokoro/build.sh
8888
env:
8989
JOB_TYPE: clirr
90-
# compilation failure for sub-modules using source and target options 7 (this setting cannot be upgraded to Java 21 because some modules support max of Java 8)
91-
# Hence compile in Java 8 and test in Java 21.
90+
# compilation failure for sub-modules using source and target options 7 (this setting cannot be upgraded to Java 21 because some modules support max of Java 8)
91+
# Hence compile in Java 8 and test in Java 21.
9292
units-java21:
9393
# Building using Java 8 and run the tests with Java 21 runtime
9494
name: "units (21)"
9595
runs-on: ubuntu-latest
9696
steps:
97-
- uses: actions/checkout@v3
98-
- uses: actions/setup-java@v3
99-
with:
100-
java-version: 21
101-
distribution: temurin
102-
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
103-
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
104-
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
105-
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
106-
shell: bash
107-
- uses: actions/setup-java@v3
108-
with:
109-
java-version: 8
110-
distribution: temurin
111-
- run: .kokoro/build.sh
112-
env:
113-
JOB_TYPE: test
97+
- uses: actions/checkout@v3
98+
- uses: actions/setup-java@v3
99+
with:
100+
java-version: 21
101+
distribution: temurin
102+
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
103+
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
104+
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
105+
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
106+
shell: bash
107+
- uses: actions/setup-java@v3
108+
with:
109+
java-version: 8
110+
distribution: temurin
111+
- run: .kokoro/build.sh
112+
env:
113+
JOB_TYPE: test

β€Ž.kokoro/dependencies.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ function determineMavenOpts() {
3838
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
3939
)
4040

41-
if [[ $javaVersion == 17* ]]
41+
# Extract the major version for simple comparison
42+
local javaMajorVersion=$(echo $javaVersion | cut -d'.' -f1)
43+
44+
if [[ $javaMajorVersion -ge 17 ]]
4245
then
4346
# MaxPermSize is no longer supported as of jdk 17
4447
echo -n "-Xmx1024m"

β€Ž.kokoro/release/bump_snapshot.cfg

Lines changed: 0 additions & 53 deletions
This file was deleted.

β€Ž.kokoro/release/bump_snapshot.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

β€Ž.kokoro/release/common.cfg

Lines changed: 0 additions & 49 deletions
This file was deleted.

β€Ž.kokoro/release/common.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

β€Ž.kokoro/release/drop.cfg

Lines changed: 0 additions & 6 deletions
This file was deleted.

β€Ž.kokoro/release/drop.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

β€Ž.kokoro/release/promote.cfg

Lines changed: 0 additions & 6 deletions
This file was deleted.

β€Ž.kokoro/release/promote.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

β€Ž.kokoro/release/publish_javadoc.cfg

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
Β (0)