Skip to content

Commit 36b7c07

Browse files
committed
ci: configure the protected branch
1 parent 153fa4a commit 36b7c07

File tree

3 files changed

+256
-259
lines changed

3 files changed

+256
-259
lines changed

.github/workflows/ci.yaml

Lines changed: 82 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,62 @@
1-
# Copyright 2022 Google LLC
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
# Github action job to test core java library features on
15-
# downstream client libraries before they are released.
16-
on:
1+
'on':
172
push:
183
branches:
19-
- main
20-
pull_request:
4+
- 1.36.x
5+
pull_request: null
216
name: ci
227
jobs:
238
units:
249
runs-on: ubuntu-latest
2510
strategy:
2611
fail-fast: false
2712
matrix:
28-
java: [11, 17, 21, 24]
13+
java:
14+
- 11
15+
- 17
16+
- 21
17+
- 24
2918
steps:
30-
- uses: actions/checkout@v4
31-
- uses: actions/setup-java@v4
32-
with:
33-
distribution: temurin
34-
java-version: ${{matrix.java}}
35-
- run: java -version
36-
- run: .kokoro/build.sh
37-
env:
38-
JOB_TYPE: test
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-java@v4
21+
with:
22+
distribution: temurin
23+
java-version: ${{matrix.java}}
24+
- run: java -version
25+
- run: .kokoro/build.sh
26+
env:
27+
JOB_TYPE: test
3928
units-logging:
4029
runs-on: ubuntu-latest
4130
strategy:
4231
fail-fast: false
4332
matrix:
44-
java: [11, 17, 21, 24]
33+
java:
34+
- 11
35+
- 17
36+
- 21
37+
- 24
4538
steps:
46-
- uses: actions/checkout@v4
47-
- uses: actions/setup-java@v4
48-
with:
49-
distribution: temurin
50-
java-version: ${{matrix.java}}
51-
- run: java -version
52-
- run: .kokoro/build.sh
53-
env:
54-
JOB_TYPE: test-logging
39+
- uses: actions/checkout@v4
40+
- uses: actions/setup-java@v4
41+
with:
42+
distribution: temurin
43+
java-version: ${{matrix.java}}
44+
- run: java -version
45+
- run: .kokoro/build.sh
46+
env:
47+
JOB_TYPE: test-logging
5548
units-java8:
56-
# Building using Java 17 and run the tests with Java 8 runtime
57-
name: "units (8)"
49+
name: units (8)
5850
runs-on: ubuntu-latest
5951
steps:
6052
- uses: actions/checkout@v4
6153
- uses: actions/setup-java@v4
6254
with:
6355
java-version: 8
6456
distribution: temurin
65-
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
66-
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
67-
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
57+
- name: >-
58+
Set jvm system property environment variable for surefire plugin (unit
59+
tests)
6860
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
6961
shell: bash
7062
- uses: actions/setup-java@v4
@@ -77,63 +69,64 @@ jobs:
7769
windows:
7870
runs-on: windows-latest
7971
steps:
80-
- name: Support longpaths
81-
run: git config --system core.longpaths true
82-
- uses: actions/checkout@v4
83-
- uses: actions/setup-java@v4
84-
with:
85-
distribution: temurin
86-
java-version: 8
87-
- run: java -version
88-
- run: .kokoro/build.bat
89-
env:
90-
JOB_TYPE: test
72+
- name: Support longpaths
73+
run: git config --system core.longpaths true
74+
- uses: actions/checkout@v4
75+
- uses: actions/setup-java@v4
76+
with:
77+
distribution: temurin
78+
java-version: 8
79+
- run: java -version
80+
- run: .kokoro/build.bat
81+
env:
82+
JOB_TYPE: test
9183
dependencies:
9284
runs-on: ubuntu-latest
9385
strategy:
9486
matrix:
95-
java: [17]
87+
java:
88+
- 17
9689
steps:
97-
- uses: actions/checkout@v4
98-
- uses: actions/setup-java@v4
99-
with:
100-
distribution: temurin
101-
java-version: ${{matrix.java}}
102-
- run: java -version
103-
- run: .kokoro/dependencies.sh
90+
- uses: actions/checkout@v4
91+
- uses: actions/setup-java@v4
92+
with:
93+
distribution: temurin
94+
java-version: ${{matrix.java}}
95+
- run: java -version
96+
- run: .kokoro/dependencies.sh
10497
javadoc:
10598
runs-on: ubuntu-latest
10699
steps:
107-
- uses: actions/checkout@v4
108-
- uses: actions/setup-java@v4
109-
with:
110-
distribution: temurin
111-
java-version: 17
112-
- run: java -version
113-
- run: .kokoro/build.sh
114-
env:
115-
JOB_TYPE: javadoc
100+
- uses: actions/checkout@v4
101+
- uses: actions/setup-java@v4
102+
with:
103+
distribution: temurin
104+
java-version: 17
105+
- run: java -version
106+
- run: .kokoro/build.sh
107+
env:
108+
JOB_TYPE: javadoc
116109
lint:
117110
runs-on: ubuntu-latest
118111
steps:
119-
- uses: actions/checkout@v4
120-
- uses: actions/setup-java@v4
121-
with:
122-
distribution: temurin
123-
java-version: 17
124-
- run: java -version
125-
- run: .kokoro/build.sh
126-
env:
127-
JOB_TYPE: lint
112+
- uses: actions/checkout@v4
113+
- uses: actions/setup-java@v4
114+
with:
115+
distribution: temurin
116+
java-version: 17
117+
- run: java -version
118+
- run: .kokoro/build.sh
119+
env:
120+
JOB_TYPE: lint
128121
clirr:
129122
runs-on: ubuntu-latest
130123
steps:
131-
- uses: actions/checkout@v4
132-
- uses: actions/setup-java@v4
133-
with:
134-
distribution: temurin
135-
java-version: 8
136-
- run: java -version
137-
- run: .kokoro/build.sh
138-
env:
139-
JOB_TYPE: clirr
124+
- uses: actions/checkout@v4
125+
- uses: actions/setup-java@v4
126+
with:
127+
distribution: temurin
128+
java-version: 8
129+
- run: java -version
130+
- run: .kokoro/build.sh
131+
env:
132+
JOB_TYPE: clirr

0 commit comments

Comments
 (0)