Skip to content

Commit aa87dfd

Browse files
blakeli0blakeli0
authored
ci: configure the protected branch (#4339)
1 parent 4092a98 commit aa87dfd

File tree

2 files changed

+113
-127
lines changed

2 files changed

+113
-127
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 85 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,115 @@
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.109.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, 25]
13+
java:
14+
- 11
15+
- 17
16+
- 21
17+
- 25
2918
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
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-java@v3
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-java8:
40-
# Building using Java 17 and run the tests with Java 8 runtime
41-
name: "units (8)"
29+
name: units (8)
4230
runs-on: ubuntu-latest
4331
steps:
44-
- uses: actions/checkout@v4
45-
- uses: actions/setup-java@v3
46-
with:
47-
java-version: 8
48-
distribution: temurin
49-
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
50-
shell: bash
51-
- uses: actions/setup-java@v3
52-
with:
53-
java-version: 17
54-
distribution: temurin
55-
- run: .kokoro/build.sh
56-
env:
57-
JOB_TYPE: test
32+
- uses: actions/checkout@v4
33+
- uses: actions/setup-java@v3
34+
with:
35+
java-version: 8
36+
distribution: temurin
37+
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
38+
shell: bash
39+
- uses: actions/setup-java@v3
40+
with:
41+
java-version: 17
42+
distribution: temurin
43+
- run: .kokoro/build.sh
44+
env:
45+
JOB_TYPE: test
5846
windows:
5947
runs-on: windows-latest
6048
steps:
61-
- uses: actions/checkout@v4
62-
- uses: actions/setup-java@v3
63-
with:
64-
java-version: 8
65-
distribution: temurin
66-
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
67-
shell: bash
68-
- uses: actions/setup-java@v3
69-
with:
70-
java-version: 11
71-
distribution: temurin
72-
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
73-
shell: bash
74-
- run: java -version
75-
- run: .kokoro/build.bat
76-
env:
77-
JOB_TYPE: test
49+
- uses: actions/checkout@v4
50+
- uses: actions/setup-java@v3
51+
with:
52+
java-version: 8
53+
distribution: temurin
54+
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
55+
shell: bash
56+
- uses: actions/setup-java@v3
57+
with:
58+
java-version: 11
59+
distribution: temurin
60+
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
61+
shell: bash
62+
- run: java -version
63+
- run: .kokoro/build.bat
64+
env:
65+
JOB_TYPE: test
7866
dependencies:
7967
runs-on: ubuntu-latest
8068
strategy:
8169
matrix:
82-
java: [17]
70+
java:
71+
- 17
8372
steps:
84-
- uses: actions/checkout@v4
85-
- uses: actions/setup-java@v3
86-
with:
87-
distribution: temurin
88-
java-version: ${{matrix.java}}
89-
- run: java -version
90-
- run: .kokoro/dependencies.sh
73+
- uses: actions/checkout@v4
74+
- uses: actions/setup-java@v3
75+
with:
76+
distribution: temurin
77+
java-version: ${{matrix.java}}
78+
- run: java -version
79+
- run: .kokoro/dependencies.sh
9180
javadoc:
9281
runs-on: ubuntu-latest
9382
steps:
94-
- uses: actions/checkout@v4
95-
- uses: actions/setup-java@v3
96-
with:
97-
distribution: temurin
98-
java-version: 17
99-
- run: java -version
100-
- run: .kokoro/build.sh
101-
env:
102-
JOB_TYPE: javadoc
83+
- uses: actions/checkout@v4
84+
- uses: actions/setup-java@v3
85+
with:
86+
distribution: temurin
87+
java-version: 17
88+
- run: java -version
89+
- run: .kokoro/build.sh
90+
env:
91+
JOB_TYPE: javadoc
10392
lint:
10493
runs-on: ubuntu-latest
10594
steps:
106-
- uses: actions/checkout@v4
107-
- uses: actions/setup-java@v3
108-
with:
109-
distribution: temurin
110-
java-version: 17
111-
- run: java -version
112-
- run: .kokoro/build.sh
113-
env:
114-
JOB_TYPE: lint
95+
- uses: actions/checkout@v4
96+
- uses: actions/setup-java@v3
97+
with:
98+
distribution: temurin
99+
java-version: 17
100+
- run: java -version
101+
- run: .kokoro/build.sh
102+
env:
103+
JOB_TYPE: lint
115104
clirr:
116105
runs-on: ubuntu-latest
117106
steps:
118-
- uses: actions/checkout@v4
119-
- uses: actions/setup-java@v3
120-
with:
121-
distribution: temurin
122-
java-version: 17
123-
- run: java -version
124-
- run: .kokoro/build.sh
125-
env:
126-
JOB_TYPE: clirr
107+
- uses: actions/checkout@v4
108+
- uses: actions/setup-java@v3
109+
with:
110+
distribution: temurin
111+
java-version: 17
112+
- run: java -version
113+
- run: .kokoro/build.sh
114+
env:
115+
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.109.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@v5
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@v5
25-
with:
26-
java-version: 11
27-
distribution: temurin
28-
- name: Compiling main library
29-
run: .kokoro/build.sh
30-
- uses: actions/setup-java@v5
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@v5
18+
- uses: stCarolas/setup-maven@v5
19+
with:
20+
maven-version: 3.8.1
21+
- uses: actions/setup-java@v5
22+
with:
23+
java-version: 11
24+
distribution: temurin
25+
- name: Compiling main library
26+
run: .kokoro/build.sh
27+
- uses: actions/setup-java@v5
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)