Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Commit 40694c8

Browse files
Neenu1995renovate-botsuztomo
authored
ci: configure the protected branch (#511)
* deps: update dependency com.google.auth:google-auth-library-bom to v1.2.2 (#506) * ci: configure the protected branch * fix: dependencies.sh to work with Java 17 (#516) CC: @Neenu1995 Co-authored-by: WhiteSource Renovate <[email protected]> Co-authored-by: Tomo Suzuki <[email protected]>
1 parent ffc3cf1 commit 40694c8

File tree

5 files changed

+83
-78
lines changed

5 files changed

+83
-78
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+
- 2.4.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

‎.github/workflows/downstream.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- main
5-
pull_request:
4+
- 2.4.x
5+
pull_request: null
66
name: downstream
77
jobs:
88
dependencies:
99
runs-on: ubuntu-latest
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
java: [8, 11]
13+
java:
14+
- 8
15+
- 11
1416
repo:
1517
- java-bigquery
1618
- java-bigqueryconnection

‎.github/workflows/upper-bound-check.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- main
5-
pull_request:
4+
- 2.4.x
5+
pull_request: null
66
name: upper-bound-check
77
jobs:
88
upper-bound-check:

‎.kokoro/dependencies.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,13 @@ function determineMavenOpts() {
3737
| sed -E 's/^.*"(.*?)".*$/\1/g' \
3838
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
3939
)
40-
41-
case $javaVersion in
42-
"17")
40+
if [[ $javaVersion == 17* ]]
41+
then
4342
# MaxPermSize is no longer supported as of jdk 17
4443
echo -n "-Xmx1024m"
45-
;;
46-
*)
44+
else
4745
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
48-
;;
49-
esac
46+
fi
5047
}
5148

5249
export MAVEN_OPTS=$(determineMavenOpts)

‎first-party-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<google.api-common.version>2.0.5</google.api-common.version>
6464
<google.common-protos.version>2.6.0</google.common-protos.version>
6565
<google.core.version>2.2.0</google.core.version>
66-
<google.auth.version>1.2.1</google.auth.version>
66+
<google.auth.version>1.2.2</google.auth.version>
6767
<google.http-client.version>1.40.1</google.http-client.version>
6868
<google.oauth-client.version>1.32.1</google.oauth-client.version>
6969
<google.api-client.version>1.32.2</google.api-client.version>

0 commit comments

Comments
 (0)