Skip to content

Commit

Permalink
remove ci.yaml from owlbot post-processing
Browse files Browse the repository at this point in the history
  • Loading branch information
alicejli committed Mar 22, 2024
1 parent 02dcebc commit 7c28ac6
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 40 deletions.
56 changes: 23 additions & 33 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [11, 17, 21]
java: [8, 11, 17, 21]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand All @@ -36,28 +36,6 @@ jobs:
- run: .kokoro/build.sh
env:
JOB_TYPE: test
units-java8:
# Building using Java 17 and run the tests with Java 8 runtime
name: "units (8)"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 8
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: 17
distribution: temurin
- run: .kokoro/build.sh
env:
JOB_TYPE: test
windows:
runs-on: windows-latest
steps:
Expand All @@ -76,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [17]
java: [8, 11, 17, 21]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand All @@ -85,39 +63,51 @@ jobs:
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
javadoc:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 11
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: javadoc
lint:
JOB_TYPE: lint
clirr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 8
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: lint
clirr:
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.
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
- run: java -version
distribution: temurin
- run: .kokoro/build.sh
env:
JOB_TYPE: clirr
JOB_TYPE: test
6 changes: 0 additions & 6 deletions .kokoro/requirements.in

This file was deleted.

2 changes: 1 addition & 1 deletion owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
".github/workflows/samples.yaml",
".kokoro/build.sh",
"renovate.json",
".github/workflows/ci.yaml"
".github/workflows/ci.yaml",
".kokoro/requirements.in",
".kokoro/requirements.txt"
]
Expand Down

0 comments on commit 7c28ac6

Please sign in to comment.