Skip to content

Commit

Permalink
chore: remove obsolete kokoro configs and update DocFX profile (#1934)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
alicejli and gcf-owl-bot[bot] authored Mar 25, 2024
1 parent 53eb6a1 commit 9fe11d9
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 1,076 deletions.
48 changes: 24 additions & 24 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: zulu
distribution: temurin
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/build.sh
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: zulu
distribution: temurin
java-version: 8
- run: java -version
- run: .kokoro/build.bat
Expand All @@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: zulu
distribution: temurin
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
Expand All @@ -69,7 +69,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: zulu
distribution: temurin
java-version: 11
- run: java -version
- run: .kokoro/build.sh
Expand All @@ -81,33 +81,33 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: zulu
distribution: temurin
java-version: 8
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: clirr
# 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)
# Hence compile in Java 8 and test in Java 21.
# 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)
# Hence compile in Java 8 and test in Java 21.
units-java21:
# Building using Java 8 and run the tests with Java 21 runtime
name: "units (21)"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 21
distribution: temurin
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
shell: bash
- uses: actions/setup-java@v3
with:
java-version: 8
distribution: temurin
- run: .kokoro/build.sh
env:
JOB_TYPE: test
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 21
distribution: temurin
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
shell: bash
- uses: actions/setup-java@v3
with:
java-version: 8
distribution: temurin
- run: .kokoro/build.sh
env:
JOB_TYPE: test
5 changes: 4 additions & 1 deletion .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)

if [[ $javaVersion == 17* ]]
# Extract the major version for simple comparison
local javaMajorVersion=$(echo $javaVersion | cut -d'.' -f1)

if [[ $javaMajorVersion -ge 17 ]]
then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
Expand Down
53 changes: 0 additions & 53 deletions .kokoro/release/bump_snapshot.cfg

This file was deleted.

30 changes: 0 additions & 30 deletions .kokoro/release/bump_snapshot.sh

This file was deleted.

49 changes: 0 additions & 49 deletions .kokoro/release/common.cfg

This file was deleted.

50 changes: 0 additions & 50 deletions .kokoro/release/common.sh

This file was deleted.

6 changes: 0 additions & 6 deletions .kokoro/release/drop.cfg

This file was deleted.

32 changes: 0 additions & 32 deletions .kokoro/release/drop.sh

This file was deleted.

6 changes: 0 additions & 6 deletions .kokoro/release/promote.cfg

This file was deleted.

34 changes: 0 additions & 34 deletions .kokoro/release/promote.sh

This file was deleted.

23 changes: 0 additions & 23 deletions .kokoro/release/publish_javadoc.cfg

This file was deleted.

Loading

0 comments on commit 9fe11d9

Please sign in to comment.