Skip to content

Commit f61c413

Browse files
jinseopkim0jinseopkim0
committed
ci: configure the protected branch
1 parent a97728b commit f61c413

File tree

2 files changed

+167
-142
lines changed

2 files changed

+167
-142
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 139 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,90 @@
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+
- 6.95.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]
13+
java:
14+
- 11
15+
- 17
16+
- 21
2917
steps:
30-
- uses: actions/checkout@v4
31-
- uses: actions/setup-java@v3
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
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-java@v3
20+
with:
21+
distribution: temurin
22+
java-version: ${{matrix.java}}
23+
- run: java -version
24+
- run: .kokoro/build.sh
25+
env:
26+
JOB_TYPE: test
3927
units-with-multiplexed-session:
4028
runs-on: ubuntu-latest
4129
strategy:
4230
fail-fast: false
4331
matrix:
44-
java: [ 11, 17, 21 ]
32+
java:
33+
- 11
34+
- 17
35+
- 21
36+
steps:
37+
- uses: actions/checkout@v4
38+
- uses: actions/setup-java@v3
39+
with:
40+
distribution: temurin
41+
java-version: ${{matrix.java}}
42+
- run: java -version
43+
- run: .kokoro/build.sh
44+
env:
45+
JOB_TYPE: test
46+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
47+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
48+
units-with-regular-session:
49+
runs-on: ubuntu-latest
50+
strategy:
51+
fail-fast: false
52+
matrix:
53+
java:
54+
- 11
55+
- 17
56+
- 21
4557
steps:
46-
- uses: actions/checkout@v4
47-
- uses: actions/setup-java@v3
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
55-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
56-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
57-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
58+
- uses: actions/checkout@v4
59+
- uses: actions/setup-java@v3
60+
with:
61+
distribution: temurin
62+
java-version: ${{matrix.java}}
63+
- run: java -version
64+
- run: .kokoro/build.sh
65+
env:
66+
JOB_TYPE: test
67+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
5868
units-java8:
59-
# Building using Java 17 and run the tests with Java 8 runtime
60-
name: "units (8)"
69+
name: units (8)
6170
runs-on: ubuntu-latest
6271
steps:
63-
- uses: actions/checkout@v4
64-
- uses: actions/setup-java@v3
65-
with:
66-
java-version: 8
67-
distribution: temurin
68-
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
69-
shell: bash
70-
- uses: actions/setup-java@v3
71-
with:
72-
java-version: 17
73-
distribution: temurin
74-
- run: .kokoro/build.sh
75-
env:
76-
JOB_TYPE: test
72+
- uses: actions/checkout@v4
73+
- uses: actions/setup-java@v3
74+
with:
75+
java-version: 8
76+
distribution: temurin
77+
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
78+
shell: bash
79+
- uses: actions/setup-java@v3
80+
with:
81+
java-version: 17
82+
distribution: temurin
83+
- run: .kokoro/build.sh
84+
env:
85+
JOB_TYPE: test
7786
units-with-multiplexed-session8:
78-
# Building using Java 17 and run the tests with Java 8 runtime
79-
name: "units-with-multiplexed-session (8)"
87+
name: units-with-multiplexed-session (8)
8088
runs-on: ubuntu-latest
8189
steps:
8290
- uses: actions/checkout@v4
@@ -96,72 +104,92 @@ jobs:
96104
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
97105
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
98106
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
107+
units-with-regular-session8:
108+
name: units-with-regular-session (8)
109+
runs-on: ubuntu-latest
110+
steps:
111+
- uses: actions/checkout@v4
112+
- uses: actions/setup-java@v3
113+
with:
114+
java-version: 8
115+
distribution: temurin
116+
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
117+
shell: bash
118+
- uses: actions/setup-java@v3
119+
with:
120+
java-version: 17
121+
distribution: temurin
122+
- run: .kokoro/build.sh
123+
env:
124+
JOB_TYPE: test
125+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
99126
windows:
100127
runs-on: windows-latest
101128
steps:
102-
- uses: actions/checkout@v4
103-
- uses: actions/setup-java@v3
104-
with:
105-
java-version: 8
106-
distribution: temurin
107-
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
108-
shell: bash
109-
- uses: actions/setup-java@v3
110-
with:
111-
java-version: 11
112-
distribution: temurin
113-
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
114-
shell: bash
115-
- run: java -version
116-
- run: .kokoro/build.bat
117-
env:
118-
JOB_TYPE: test
129+
- uses: actions/checkout@v4
130+
- uses: actions/setup-java@v3
131+
with:
132+
java-version: 8
133+
distribution: temurin
134+
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
135+
shell: bash
136+
- uses: actions/setup-java@v3
137+
with:
138+
java-version: 11
139+
distribution: temurin
140+
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
141+
shell: bash
142+
- run: java -version
143+
- run: .kokoro/build.bat
144+
env:
145+
JOB_TYPE: test
119146
dependencies:
120147
runs-on: ubuntu-latest
121148
strategy:
122149
matrix:
123-
java: [17]
150+
java:
151+
- 17
124152
steps:
125-
- uses: actions/checkout@v4
126-
- uses: actions/setup-java@v3
127-
with:
128-
distribution: temurin
129-
java-version: ${{matrix.java}}
130-
- run: java -version
131-
- run: .kokoro/dependencies.sh
153+
- uses: actions/checkout@v4
154+
- uses: actions/setup-java@v3
155+
with:
156+
distribution: temurin
157+
java-version: ${{matrix.java}}
158+
- run: java -version
159+
- run: .kokoro/dependencies.sh
132160
javadoc:
133161
runs-on: ubuntu-latest
134162
steps:
135-
- uses: actions/checkout@v4
136-
- uses: actions/setup-java@v3
137-
with:
138-
distribution: temurin
139-
java-version: 17
140-
- run: java -version
141-
- run: .kokoro/build.sh
142-
env:
143-
JOB_TYPE: javadoc
163+
- uses: actions/checkout@v4
164+
- uses: actions/setup-java@v3
165+
with:
166+
distribution: temurin
167+
java-version: 17
168+
- run: java -version
169+
- run: .kokoro/build.sh
170+
env:
171+
JOB_TYPE: javadoc
144172
lint:
145173
runs-on: ubuntu-latest
146174
steps:
147-
- uses: actions/checkout@v4
148-
- uses: actions/setup-java@v3
149-
with:
150-
distribution: temurin
151-
java-version: 17
152-
- run: java -version
153-
- run: .kokoro/build.sh
154-
env:
155-
JOB_TYPE: lint
175+
- uses: actions/checkout@v4
176+
- uses: actions/setup-java@v3
177+
with:
178+
distribution: temurin
179+
java-version: 17
180+
- run: java -version
181+
- run: .kokoro/build.sh
182+
env:
183+
JOB_TYPE: lint
156184
clirr:
157185
runs-on: ubuntu-latest
158186
steps:
159-
- uses: actions/checkout@v4
160-
- uses: actions/setup-java@v3
161-
with:
162-
distribution: temurin
163-
java-version: 17
164-
- run: java -version
165-
- run: .kokoro/build.sh
166-
env:
167-
JOB_TYPE: clirr
187+
- uses: actions/checkout@v4
188+
- uses: actions/setup-java@v3
189+
with:
190+
distribution: temurin
191+
java-version: 17
192+
- run: java -version
193+
- run: .kokoro/build.sh
194+
env:
195+
JOB_TYPE: clirr

‎.github/workflows/integration-tests-against-emulator.yaml‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,39 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- main
5-
pull_request:
4+
- 6.95.x
5+
pull_request: null
66
name: integration-tests-against-emulator
77
jobs:
88
units:
99
runs-on: ubuntu-latest
10-
1110
services:
1211
emulator:
1312
image: gcr.io/cloud-spanner-emulator/emulator:latest
1413
ports:
15-
- 9010:9010
16-
- 9020:9020
17-
14+
- '9010:9010'
15+
- '9020:9020'
1816
steps:
19-
- uses: actions/checkout@v4
20-
- uses: stCarolas/setup-maven@v5
21-
with:
22-
maven-version: 3.8.1
23-
# Build with JDK 11 and run tests with JDK 8
24-
- uses: actions/setup-java@v4
25-
with:
26-
java-version: 11
27-
distribution: temurin
28-
- name: Compiling main library
29-
run: .kokoro/build.sh
30-
- uses: actions/setup-java@v4
31-
with:
32-
java-version: 8
33-
distribution: temurin
34-
- name: Running tests
35-
run: |
36-
mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \
37-
-DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \
38-
-Dmaven.main.skip=true -fae verify
39-
env:
40-
JOB_TYPE: test
41-
SPANNER_EMULATOR_HOST: localhost:9010
42-
GOOGLE_CLOUD_PROJECT: emulator-test-project
17+
- uses: actions/checkout@v4
18+
- uses: stCarolas/setup-maven@v5
19+
with:
20+
maven-version: 3.8.1
21+
- uses: actions/setup-java@v4
22+
with:
23+
java-version: 11
24+
distribution: temurin
25+
- name: Compiling main library
26+
run: .kokoro/build.sh
27+
- uses: actions/setup-java@v4
28+
with:
29+
java-version: 8
30+
distribution: temurin
31+
- name: Running tests
32+
run: |
33+
mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \
34+
-DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \
35+
-Dmaven.main.skip=true -fae verify
36+
env:
37+
JOB_TYPE: test
38+
SPANNER_EMULATOR_HOST: localhost:9010
39+
GOOGLE_CLOUD_PROJECT: emulator-test-project

0 commit comments

Comments
 (0)