Skip to content

Commit 46800a3

Browse files
authored
feat: configure initial sp version (#1156)
1 parent 8fc985d commit 46800a3

File tree

2 files changed

+83
-71
lines changed

2 files changed

+83
-71
lines changed

.github/workflows/ci.yaml

Lines changed: 64 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,90 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- master
5-
pull_request:
4+
- 3.3.3-sp
5+
pull_request: null
66
name: ci
77
jobs:
88
units:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [7, 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
22-
- name: coverage
23-
uses: codecov/codecov-action@v1
24-
with:
25-
name: actions ${{matrix.java}}
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
24+
- name: coverage
25+
uses: codecov/codecov-action@v1
26+
with:
27+
name: actions ${{matrix.java}}
2628
windows:
2729
runs-on: windows-latest
2830
steps:
29-
- uses: actions/checkout@v2
30-
- uses: actions/setup-java@v1
31-
with:
32-
java-version: 8
33-
- run: java -version
34-
- run: .kokoro/build.bat
35-
env:
36-
JOB_TYPE: test
31+
- uses: actions/checkout@v2
32+
- uses: actions/setup-java@v1
33+
with:
34+
java-version: 8
35+
- run: java -version
36+
- run: .kokoro/build.bat
37+
env:
38+
JOB_TYPE: test
3739
dependencies:
3840
runs-on: ubuntu-latest
3941
strategy:
4042
matrix:
41-
java: [8, 11]
43+
java:
44+
- 8
45+
- 11
4246
steps:
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
47+
- uses: actions/checkout@v2
48+
- uses: actions/setup-java@v1
49+
with:
50+
java-version: ${{matrix.java}}
51+
- run: java -version
52+
- run: .kokoro/dependencies.sh
4953
linkage-monitor:
5054
runs-on: ubuntu-latest
5155
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions/setup-java@v1
54-
with:
55-
java-version: 8
56-
- run: java -version
57-
- run: .kokoro/linkage-monitor.sh
56+
- uses: actions/checkout@v2
57+
- uses: actions/setup-java@v1
58+
with:
59+
java-version: 8
60+
- run: java -version
61+
- name: Install artifacts to local Maven repository
62+
run: .kokoro/build.sh
63+
shell: bash
64+
- name: >-
65+
Validate any conflicts with regard to com.google.cloud:libraries-bom
66+
(latest release)
67+
uses: >-
68+
GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
5869
lint:
5970
runs-on: ubuntu-latest
6071
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
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: lint
6980
clirr:
7081
runs-on: ubuntu-latest
7182
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
83+
- uses: actions/checkout@v2
84+
- uses: actions/setup-java@v1
85+
with:
86+
java-version: 8
87+
- run: java -version
88+
- run: .kokoro/build.sh
89+
env:
90+
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+
- 3.3.3-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)