Skip to content

Commit 5f4b8c7

Browse files
authored
ci: configure the protected branch (#1519)
1 parent a4c1673 commit 5f4b8c7

File tree

2 files changed

+91
-84
lines changed

2 files changed

+91
-84
lines changed

.github/workflows/ci.yaml

Lines changed: 69 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,92 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- main
5-
pull_request:
4+
- 6.14.x
5+
pull_request: null
66
name: ci
77
jobs:
88
units:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [8, 11, 17]
12+
java:
13+
- 8
14+
- 11
15+
- 17
1316
steps:
14-
- uses: actions/checkout@v2
15-
- uses: stCarolas/setup-maven@v4
16-
with:
17-
maven-version: 3.8.1
18-
- uses: actions/setup-java@v2
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
17+
- uses: actions/checkout@v2
18+
- uses: stCarolas/setup-maven@v4
19+
with:
20+
maven-version: 3.8.1
21+
- uses: actions/setup-java@v2
22+
with:
23+
distribution: zulu
24+
java-version: ${{matrix.java}}
25+
- run: java -version
26+
- run: .kokoro/build.sh
27+
env:
28+
JOB_TYPE: test
2629
windows:
2730
runs-on: windows-latest
2831
steps:
29-
- uses: actions/checkout@v2
30-
- uses: stCarolas/setup-maven@v4
31-
with:
32-
maven-version: 3.8.1
33-
- uses: actions/setup-java@v2
34-
with:
35-
distribution: zulu
36-
java-version: 8
37-
- run: java -version
38-
- run: .kokoro/build.bat
39-
env:
40-
JOB_TYPE: test
32+
- uses: actions/checkout@v2
33+
- uses: stCarolas/setup-maven@v4
34+
with:
35+
maven-version: 3.8.1
36+
- uses: actions/setup-java@v2
37+
with:
38+
distribution: zulu
39+
java-version: 8
40+
- run: java -version
41+
- run: .kokoro/build.bat
42+
env:
43+
JOB_TYPE: test
4144
dependencies:
4245
runs-on: ubuntu-latest
4346
strategy:
4447
matrix:
45-
java: [8, 11, 17]
48+
java:
49+
- 8
50+
- 11
51+
- 17
4652
steps:
47-
- uses: actions/checkout@v2
48-
- uses: stCarolas/setup-maven@v4
49-
with:
50-
maven-version: 3.8.1
51-
- uses: actions/setup-java@v2
52-
with:
53-
distribution: zulu
54-
java-version: ${{matrix.java}}
55-
- run: java -version
56-
- run: .kokoro/dependencies.sh
53+
- uses: actions/checkout@v2
54+
- uses: stCarolas/setup-maven@v4
55+
with:
56+
maven-version: 3.8.1
57+
- uses: actions/setup-java@v2
58+
with:
59+
distribution: zulu
60+
java-version: ${{matrix.java}}
61+
- run: java -version
62+
- run: .kokoro/dependencies.sh
5763
lint:
5864
runs-on: ubuntu-latest
5965
steps:
60-
- uses: actions/checkout@v2
61-
- uses: stCarolas/setup-maven@v4
62-
with:
63-
maven-version: 3.8.1
64-
- uses: actions/setup-java@v2
65-
with:
66-
distribution: zulu
67-
java-version: 8
68-
- run: java -version
69-
- run: .kokoro/build.sh
70-
env:
71-
JOB_TYPE: lint
66+
- uses: actions/checkout@v2
67+
- uses: stCarolas/setup-maven@v4
68+
with:
69+
maven-version: 3.8.1
70+
- uses: actions/setup-java@v2
71+
with:
72+
distribution: zulu
73+
java-version: 8
74+
- run: java -version
75+
- run: .kokoro/build.sh
76+
env:
77+
JOB_TYPE: lint
7278
clirr:
7379
runs-on: ubuntu-latest
7480
steps:
75-
- uses: actions/checkout@v2
76-
- uses: stCarolas/setup-maven@v4
77-
with:
78-
maven-version: 3.8.1
79-
- uses: actions/setup-java@v2
80-
with:
81-
distribution: zulu
82-
java-version: 8
83-
- run: java -version
84-
- run: .kokoro/build.sh
85-
env:
86-
JOB_TYPE: clirr
81+
- uses: actions/checkout@v2
82+
- uses: stCarolas/setup-maven@v4
83+
with:
84+
maven-version: 3.8.1
85+
- uses: actions/setup-java@v2
86+
with:
87+
distribution: zulu
88+
java-version: 8
89+
- run: java -version
90+
- run: .kokoro/build.sh
91+
env:
92+
JOB_TYPE: clirr
Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- main
5-
pull_request:
4+
- 6.14.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@v1
22+
with:
23+
java-version: 8
24+
- run: java -version
25+
- run: .kokoro/build.sh
26+
- run: >-
27+
mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests
28+
-DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae
29+
verify
30+
env:
31+
JOB_TYPE: test
32+
SPANNER_EMULATOR_HOST: localhost:9010
33+
GOOGLE_CLOUD_PROJECT: emulator-test-project

0 commit comments

Comments
 (0)