Skip to content

Commit a5fbf89

Browse files
rajatbhattarajatbhatta
authored
ci: configure the protected branch (#2033)
1 parent 1cf4cab commit a5fbf89

File tree

2 files changed

+125
-84
lines changed

2 files changed

+125
-84
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 92 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,116 @@
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.23.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: [8, 11, 17]
13+
java:
14+
- 11
15+
- 17
2916
steps:
30-
- uses: actions/checkout@v3
31-
- uses: actions/setup-java@v3
32-
with:
33-
distribution: zulu
34-
java-version: ${{matrix.java}}
35-
- run: java -version
36-
- run: .kokoro/build.sh
37-
env:
38-
JOB_TYPE: test
17+
- uses: actions/checkout@v3
18+
- uses: actions/setup-java@v3
19+
with:
20+
distribution: zulu
21+
java-version: ${{matrix.java}}
22+
- run: java -version
23+
- run: .kokoro/build.sh
24+
env:
25+
JOB_TYPE: test
26+
units-java8:
27+
name: units (8)
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: actions/checkout@v3
31+
- uses: actions/setup-java@v3
32+
with:
33+
java-version: 8
34+
distribution: zulu
35+
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
36+
shell: bash
37+
- uses: actions/setup-java@v3
38+
with:
39+
java-version: 11
40+
distribution: zulu
41+
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
42+
shell: bash
43+
- run: .kokoro/build.sh
44+
env:
45+
JOB_TYPE: test
3946
windows:
4047
runs-on: windows-latest
4148
steps:
42-
- uses: actions/checkout@v3
43-
- uses: actions/setup-java@v3
44-
with:
45-
distribution: zulu
46-
java-version: 8
47-
- run: java -version
48-
- run: .kokoro/build.bat
49-
env:
50-
JOB_TYPE: test
49+
- uses: actions/checkout@v3
50+
- uses: actions/setup-java@v3
51+
with:
52+
java-version: 8
53+
distribution: zulu
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: zulu
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
5166
dependencies:
5267
runs-on: ubuntu-latest
5368
strategy:
5469
matrix:
55-
java: [8, 11, 17]
70+
java:
71+
- 8
72+
- 11
73+
- 17
5674
steps:
57-
- uses: actions/checkout@v3
58-
- uses: actions/setup-java@v3
59-
with:
60-
distribution: zulu
61-
java-version: ${{matrix.java}}
62-
- run: java -version
63-
- run: .kokoro/dependencies.sh
75+
- uses: actions/checkout@v3
76+
- if: ${{matrix.java}} == '8'
77+
uses: actions/setup-java@v3
78+
with:
79+
java-version: 11
80+
distribution: zulu
81+
- if: ${{matrix.java}} == '8'
82+
run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
83+
shell: bash
84+
- uses: actions/setup-java@v3
85+
with:
86+
distribution: zulu
87+
java-version: ${{matrix.java}}
88+
- if: ${{matrix.java}} == '8'
89+
run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
90+
shell: bash
91+
- run: java -version
92+
- run: .kokoro/dependencies.sh
6493
lint:
6594
runs-on: ubuntu-latest
6695
steps:
67-
- uses: actions/checkout@v3
68-
- uses: actions/setup-java@v3
69-
with:
70-
distribution: zulu
71-
java-version: 11
72-
- run: java -version
73-
- run: .kokoro/build.sh
74-
env:
75-
JOB_TYPE: lint
96+
- uses: actions/checkout@v3
97+
- uses: actions/setup-java@v3
98+
with:
99+
distribution: zulu
100+
java-version: 11
101+
- run: java -version
102+
- run: .kokoro/build.sh
103+
env:
104+
JOB_TYPE: lint
76105
clirr:
77106
runs-on: ubuntu-latest
78107
steps:
79-
- uses: actions/checkout@v3
80-
- uses: actions/setup-java@v3
81-
with:
82-
distribution: zulu
83-
java-version: 8
84-
- run: java -version
85-
- run: .kokoro/build.sh
86-
env:
87-
JOB_TYPE: clirr
108+
- uses: actions/checkout@v3
109+
- uses: actions/setup-java@v3
110+
with:
111+
distribution: zulu
112+
java-version: 11
113+
- run: java -version
114+
- run: .kokoro/build.sh
115+
env:
116+
JOB_TYPE: clirr

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

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,44 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- main
5-
pull_request:
4+
- 6.23.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@v2
20-
- uses: stCarolas/setup-maven@v4
21-
with:
22-
maven-version: 3.8.1
23-
- uses: actions/setup-java@v1
24-
with:
25-
java-version: 8
26-
- run: java -version
27-
- run: .kokoro/build.sh
28-
- run: mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae verify
29-
env:
30-
JOB_TYPE: test
31-
SPANNER_EMULATOR_HOST: localhost:9010
32-
GOOGLE_CLOUD_PROJECT: emulator-test-project
17+
- uses: actions/checkout@v2
18+
- uses: stCarolas/setup-maven@v4
19+
with:
20+
maven-version: 3.8.1
21+
- uses: actions/setup-java@v3
22+
with:
23+
java-version: 11
24+
distribution: zulu
25+
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
26+
shell: bash
27+
- uses: actions/setup-java@v3
28+
with:
29+
java-version: 8
30+
distribution: zulu
31+
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
32+
shell: bash
33+
- run: java -version
34+
- name: Compiling main library
35+
run: .kokoro/build.sh
36+
- name: Running tests
37+
run: |
38+
mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests \
39+
-DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \
40+
-Dmaven.main.skip=true -fae verify
41+
env:
42+
JOB_TYPE: test
43+
SPANNER_EMULATOR_HOST: localhost:9010
44+
GOOGLE_CLOUD_PROJECT: emulator-test-project

0 commit comments

Comments
 (0)