From 40694c863d6515ebea26c4641060af8d20807573 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 10 Nov 2021 12:57:54 -0500 Subject: [PATCH 1/2] 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 Co-authored-by: Tomo Suzuki --- .github/workflows/ci.yaml | 132 ++++++++++++----------- .github/workflows/downstream.yaml | 10 +- .github/workflows/upper-bound-check.yaml | 6 +- .kokoro/dependencies.sh | 11 +- first-party-dependencies/pom.xml | 2 +- 5 files changed, 83 insertions(+), 78 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d723..43a2e943 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index 0f1bc811..b94477d7 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -1,8 +1,8 @@ -on: +'on': push: branches: - - main - pull_request: + - 2.4.x + pull_request: null name: downstream jobs: dependencies: @@ -10,7 +10,9 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11] + java: + - 8 + - 11 repo: - java-bigquery - java-bigqueryconnection diff --git a/.github/workflows/upper-bound-check.yaml b/.github/workflows/upper-bound-check.yaml index 45cb8b9d..d62edcf7 100644 --- a/.github/workflows/upper-bound-check.yaml +++ b/.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: diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7..240e0747 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -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) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index dd9e651e..f37aee20 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -63,7 +63,7 @@ 2.0.5 2.6.0 2.2.0 - 1.2.1 + 1.2.2 1.40.1 1.32.1 1.32.2 From b182ef414ca2d0d9cd9bc2fafc9cd07bf5e353e6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 13:04:29 -0500 Subject: [PATCH 2/2] chore(2.4.x): release 2.4.1-SNAPSHOT (#518) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index f37aee20..c390eac9 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 2.4.0 + 2.4.1-SNAPSHOT Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index 98586f72..1cda34dc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.4.0 + 2.4.1-SNAPSHOT first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.4.0 + 2.4.1-SNAPSHOT pom import com.google.cloud third-party-dependencies - 2.4.0 + 2.4.1-SNAPSHOT pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 0b855086..a358aec8 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 2.4.0 + 2.4.1-SNAPSHOT Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index 287ae145..8b6cf09e 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 2.4.0 + 2.4.1-SNAPSHOT Upper bound test for Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -53,7 +53,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.4.1-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index a8de9607..f69d75b2 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.4.0:2.4.0 \ No newline at end of file +google-cloud-shared-dependencies:2.4.0:2.4.1-SNAPSHOT \ No newline at end of file