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

Commit

Permalink
ci: configure the protected branch (#511)
Browse files Browse the repository at this point in the history
* 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 <bot@renovateapp.com>
Co-authored-by: Tomo Suzuki <suztomo@google.com>
  • Loading branch information
3 people committed Nov 10, 2021
1 parent ffc3cf1 commit 40694c8
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 78 deletions.
132 changes: 69 additions & 63 deletions .github/workflows/ci.yaml
@@ -1,86 +1,92 @@
on:
'on':
push:
branches:
- main
pull_request:
- 2.4.x
pull_request: null
name: ci
jobs:
units:
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11, 17]
java:
- 8
- 11
- 17
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: test
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: test
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.bat
env:
JOB_TYPE: test
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.bat
env:
JOB_TYPE: test
dependencies:
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11, 17]
java:
- 8
- 11
- 17
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: lint
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: lint
clirr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: clirr
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: clirr
10 changes: 6 additions & 4 deletions .github/workflows/downstream.yaml
@@ -1,16 +1,18 @@
on:
'on':
push:
branches:
- main
pull_request:
- 2.4.x
pull_request: null
name: downstream
jobs:
dependencies:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java: [8, 11]
java:
- 8
- 11
repo:
- java-bigquery
- java-bigqueryconnection
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/upper-bound-check.yaml
@@ -1,8 +1,8 @@
on:
'on':
push:
branches:
- main
pull_request:
- 2.4.x
pull_request: null
name: upper-bound-check
jobs:
upper-bound-check:
Expand Down
11 changes: 4 additions & 7 deletions .kokoro/dependencies.sh
Expand Up @@ -37,16 +37,13 @@ function determineMavenOpts() {
| sed -E 's/^.*"(.*?)".*$/\1/g' \
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)

case $javaVersion in
"17")
if [[ $javaVersion == 17* ]]
then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
;;
*)
else
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
;;
esac
fi
}

export MAVEN_OPTS=$(determineMavenOpts)
Expand Down
2 changes: 1 addition & 1 deletion first-party-dependencies/pom.xml
Expand Up @@ -63,7 +63,7 @@
<google.api-common.version>2.0.5</google.api-common.version>
<google.common-protos.version>2.6.0</google.common-protos.version>
<google.core.version>2.2.0</google.core.version>
<google.auth.version>1.2.1</google.auth.version>
<google.auth.version>1.2.2</google.auth.version>
<google.http-client.version>1.40.1</google.http-client.version>
<google.oauth-client.version>1.32.1</google.oauth-client.version>
<google.api-client.version>1.32.2</google.api-client.version>
Expand Down

0 comments on commit 40694c8

Please sign in to comment.