Skip to content

Commit 830277c

Browse files
authored
feat: configure initial sp version (#1366)
1 parent 2f97809 commit 830277c

File tree

2 files changed

+79
-71
lines changed

2 files changed

+79
-71
lines changed

.github/workflows/ci.yaml

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,86 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- master
5-
pull_request:
4+
- 6.4.4-sp
5+
pull_request: null
66
name: ci
77
jobs:
88
units:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [8, 11]
12+
java:
13+
- 8
14+
- 11
1315
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-java@v1
16-
with:
17-
java-version: ${{matrix.java}}
18-
- run: java -version
19-
- run: .kokoro/build.sh
20-
env:
21-
JOB_TYPE: test
16+
- uses: actions/checkout@v2
17+
- uses: actions/setup-java@v1
18+
with:
19+
java-version: ${{matrix.java}}
20+
- run: java -version
21+
- run: .kokoro/build.sh
22+
env:
23+
JOB_TYPE: test
2224
windows:
2325
runs-on: windows-latest
2426
steps:
25-
- uses: actions/checkout@v2
26-
- uses: actions/setup-java@v1
27-
with:
28-
java-version: 8
29-
- run: java -version
30-
- run: .kokoro/build.bat
31-
env:
32-
JOB_TYPE: test
27+
- uses: actions/checkout@v2
28+
- uses: actions/setup-java@v1
29+
with:
30+
java-version: 8
31+
- run: java -version
32+
- run: .kokoro/build.bat
33+
env:
34+
JOB_TYPE: test
3335
dependencies:
3436
runs-on: ubuntu-latest
3537
strategy:
3638
matrix:
37-
java: [8, 11]
39+
java:
40+
- 8
41+
- 11
3842
steps:
39-
- uses: actions/checkout@v2
40-
- uses: actions/setup-java@v1
41-
with:
42-
java-version: ${{matrix.java}}
43-
- run: java -version
44-
- run: .kokoro/dependencies.sh
43+
- uses: actions/checkout@v2
44+
- uses: actions/setup-java@v1
45+
with:
46+
java-version: ${{matrix.java}}
47+
- run: java -version
48+
- run: .kokoro/dependencies.sh
4549
linkage-monitor:
4650
runs-on: ubuntu-latest
4751
steps:
48-
- uses: actions/checkout@v2
49-
- uses: actions/setup-java@v1
50-
with:
51-
java-version: 8
52-
- run: java -version
53-
- name: Install artifacts to local Maven repository
54-
run: .kokoro/build.sh
55-
shell: bash
56-
- name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
57-
uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
52+
- uses: actions/checkout@v2
53+
- uses: actions/setup-java@v1
54+
with:
55+
java-version: 8
56+
- run: java -version
57+
- name: Install artifacts to local Maven repository
58+
run: .kokoro/build.sh
59+
shell: bash
60+
- name: >-
61+
Validate any conflicts with regard to com.google.cloud:libraries-bom
62+
(latest release)
63+
uses: >-
64+
GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
5865
lint:
5966
runs-on: ubuntu-latest
6067
steps:
61-
- uses: actions/checkout@v2
62-
- uses: actions/setup-java@v1
63-
with:
64-
java-version: 8
65-
- run: java -version
66-
- run: .kokoro/build.sh
67-
env:
68-
JOB_TYPE: lint
68+
- uses: actions/checkout@v2
69+
- uses: actions/setup-java@v1
70+
with:
71+
java-version: 8
72+
- run: java -version
73+
- run: .kokoro/build.sh
74+
env:
75+
JOB_TYPE: lint
6976
clirr:
7077
runs-on: ubuntu-latest
7178
steps:
72-
- uses: actions/checkout@v2
73-
- uses: actions/setup-java@v1
74-
with:
75-
java-version: 8
76-
- run: java -version
77-
- run: .kokoro/build.sh
78-
env:
79-
JOB_TYPE: clirr
79+
- uses: actions/checkout@v2
80+
- uses: actions/setup-java@v1
81+
with:
82+
java-version: 8
83+
- run: java -version
84+
- run: .kokoro/build.sh
85+
env:
86+
JOB_TYPE: clirr
Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- master
5-
pull_request:
4+
- 6.4.4-sp
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: actions/setup-java@v1
21-
with:
22-
java-version: 8
23-
- run: java -version
24-
- run: .kokoro/build.sh
25-
- run: mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae verify
26-
env:
27-
JOB_TYPE: test
28-
SPANNER_EMULATOR_HOST: localhost:9010
29-
GOOGLE_CLOUD_PROJECT: emulator-test-project
17+
- uses: actions/checkout@v2
18+
- uses: actions/setup-java@v1
19+
with:
20+
java-version: 8
21+
- run: java -version
22+
- run: .kokoro/build.sh
23+
- run: >-
24+
mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests
25+
-DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae
26+
verify
27+
env:
28+
JOB_TYPE: test
29+
SPANNER_EMULATOR_HOST: localhost:9010
30+
GOOGLE_CLOUD_PROJECT: emulator-test-project

0 commit comments

Comments
 (0)