From d0e082cda18ae81d548019c48cbb849390ef76ae Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 9 Nov 2022 15:02:48 -0500 Subject: [PATCH 1/4] ci: configure the protected branch (#911) --- .github/workflows/ci.yaml | 121 ++++---- .../workflows/downstream-native-image.yaml | 24 +- .github/workflows/downstream.yaml | 280 +++++++++--------- .github/workflows/version-check.yaml | 40 +-- 4 files changed, 219 insertions(+), 246 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e3bb26e3..a332870e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,23 +1,8 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Github action job to test core java library features on -# downstream client libraries before they are released. -on: +'on': push: branches: - - main - pull_request: + - 3.0.x + pull_request: null name: ci jobs: units: @@ -25,65 +10,71 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11, 17] + java: + - 8 + - 11 + - 17 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: zulu - java-version: ${{matrix.java}} - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: test + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: test windows: runs-on: windows-latest steps: - - name: Support longpaths - run: git config --system core.longpaths true - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: zulu - java-version: 8 - - run: java -version - - run: .kokoro/build.bat - env: - JOB_TYPE: test + - name: Support longpaths + run: git config --system core.longpaths true + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + 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@v3 - - uses: actions/setup-java@v3 - with: - distribution: zulu - java-version: ${{matrix.java}} - - run: java -version - - run: .kokoro/dependencies.sh + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: .kokoro/dependencies.sh lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: zulu - java-version: 11 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: lint + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: 11 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: lint clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: zulu - java-version: 8 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: clirr + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: clirr diff --git a/.github/workflows/downstream-native-image.yaml b/.github/workflows/downstream-native-image.yaml index a34a59f4..9191aeff 100644 --- a/.github/workflows/downstream-native-image.yaml +++ b/.github/workflows/downstream-native-image.yaml @@ -1,24 +1,21 @@ -on: +'on': push: branches: - - main - pull_request: - -# Keeping this file separate as the dependencies check would use more -# repositories than needed this downstream check for GraalVM native image -# compilation. + - 3.0.x + pull_request: null name: downstream-native-image jobs: - # GraalVM job ensures the compatibility of GraaVM version graalvm: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - graalvm: [22.2.0] - java: [11, 17] + graalvm: + - 22.2.0 + java: + - 11 + - 17 repo: - # GAPIC library that doesn't use a real GCP project in integration tests - orgpolicy steps: - uses: actions/checkout@v2 @@ -28,11 +25,6 @@ jobs: - uses: ayltai/setup-graalvm@v1 with: java-version: ${{matrix.java}} - # When a new version of native-maven-plugin fails to run in a downstream - # library, it's likely to be an incompatibility with the GraalVM version. - # In that case, you need to upgrade the Docker container used in the - # tests in the downstream repositories (not just this value below). - # Example: https://github.com/googleapis/testing-infra-docker/pull/195 graalvm-version: ${{matrix.graalvm}} native-image: true - run: java -version diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index 000fa0d5..266cc3ea 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -1,23 +1,9 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Github action job to test core java library features on -# downstream client libraries before they are released. -on: +'on': pull_request: - types: [ labeled ] + types: + - labeled branches: - - main + - 3.0.x name: downstream jobs: dependencies: @@ -26,134 +12,134 @@ jobs: strategy: fail-fast: false matrix: - java: [17] + java: + - 17 repo: - # This list needs to be updated manually until an automated solution is in place. - - accessapproval - - accesscontextmanager - - aiplatform - - analytics-admin - - analytics-data - - api-gateway - - apigee-connect - - appengine-admin - - area120-tables - - artifact-registry - - asset - - assured-workloads - - automl - - bigquery - - bigqueryconnection - - bigquerydatatransfer - - bigquerymigration - - bigqueryreservation - - bigtable - - billing - - billingbudgets - - binary-authorization - - channel - - cloudbuild - - compute - - contact-center-insights - - container - - containeranalysis - - data-fusion - - datacatalog - - dataflow - - datalabeling - - dataproc - - dataproc-metastore - - datastore - - datastream - - debugger-client - - deploy - - dialogflow - - dialogflow-cx - - dlp - - dms - - dns - - document-ai - - domains - - errorreporting - - essential-contacts - - eventarc - - filestore - - firestore - - functions - - game-servers - - gke-connect-gateway - - gkehub - - gsuite-addons - - iam-admin - - iamcredentials - - iot - - kms - - language - - life-sciences - - logging - - logging-logback - - managed-identities - - mediatranslation - - memcache - - monitoring - - monitoring-dashboards - - network-management - - network-security - - networkconnectivity - - notebooks - - orchestration-airflow - - orgpolicy - - os-config - - os-login - - phishingprotection - - policy-troubleshooter - - private-catalog - - profiler - - pubsublite - - recaptchaenterprise - - recommendations-ai - - recommender - - redis - - resource-settings - - resourcemanager - - retail - - scheduler - - secretmanager - - security-private-ca - - securitycenter - - securitycenter-settings - - service-control - - service-management - - service-usage - - servicedirectory - - shell - - spanner - - spanner-jdbc - - speech - - storage - - storage-nio - - storage-transfer - - talent - - tasks - - texttospeech - - tpu - - trace - - translate - - video-intelligence - - video-transcoder - - vision - - vpcaccess - - webrisk - - websecurityscanner - - workflow-executions - - workflows + - accessapproval + - accesscontextmanager + - aiplatform + - analytics-admin + - analytics-data + - api-gateway + - apigee-connect + - appengine-admin + - area120-tables + - artifact-registry + - asset + - assured-workloads + - automl + - bigquery + - bigqueryconnection + - bigquerydatatransfer + - bigquerymigration + - bigqueryreservation + - bigtable + - billing + - billingbudgets + - binary-authorization + - channel + - cloudbuild + - compute + - contact-center-insights + - container + - containeranalysis + - data-fusion + - datacatalog + - dataflow + - datalabeling + - dataproc + - dataproc-metastore + - datastore + - datastream + - debugger-client + - deploy + - dialogflow + - dialogflow-cx + - dlp + - dms + - dns + - document-ai + - domains + - errorreporting + - essential-contacts + - eventarc + - filestore + - firestore + - functions + - game-servers + - gke-connect-gateway + - gkehub + - gsuite-addons + - iam-admin + - iamcredentials + - iot + - kms + - language + - life-sciences + - logging + - logging-logback + - managed-identities + - mediatranslation + - memcache + - monitoring + - monitoring-dashboards + - network-management + - network-security + - networkconnectivity + - notebooks + - orchestration-airflow + - orgpolicy + - os-config + - os-login + - phishingprotection + - policy-troubleshooter + - private-catalog + - profiler + - pubsublite + - recaptchaenterprise + - recommendations-ai + - recommender + - redis + - resource-settings + - resourcemanager + - retail + - scheduler + - secretmanager + - security-private-ca + - securitycenter + - securitycenter-settings + - service-control + - service-management + - service-usage + - servicedirectory + - shell + - spanner + - spanner-jdbc + - speech + - storage + - storage-nio + - storage-transfer + - talent + - tasks + - texttospeech + - tpu + - trace + - translate + - video-intelligence + - video-transcoder + - vision + - vpcaccess + - webrisk + - websecurityscanner + - workflow-executions + - workflows steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v3 - with: - distribution: zulu - java-version: ${{matrix.java}} - - run: java -version - - run: sudo apt-get update -y - - run: sudo apt-get install libxml2-utils - - run: .kokoro/downstream-client-library-check.sh ${{matrix.repo}} test + - uses: actions/checkout@v2 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/downstream-client-library-check.sh ${{matrix.repo}} test diff --git a/.github/workflows/version-check.yaml b/.github/workflows/version-check.yaml index 7a8ed6fd..8add3c3f 100644 --- a/.github/workflows/version-check.yaml +++ b/.github/workflows/version-check.yaml @@ -1,14 +1,16 @@ -on: +'on': push: branches: - - main - pull_request: + - 3.0.x + pull_request: null name: version-check jobs: upper-bound-check: name: Upper-bound check runs-on: ubuntu-latest - if: github.repository_owner == 'googleapis' && github.head_ref == 'release-please--branches--main' + if: >- + github.repository_owner == 'googleapis' && github.head_ref == + 'release-please--branches--main' steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 @@ -26,18 +28,20 @@ jobs: grpc-convergence-check: name: gRPC dependency convergence check runs-on: ubuntu-latest - if: github.repository_owner == 'googleapis' && github.head_ref == 'release-please--branches--main' + if: >- + github.repository_owner == 'googleapis' && github.head_ref == + 'release-please--branches--main' steps: - - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install the BOM to local Maven repository - run: .kokoro/build.sh - - name: Check the BOM content satisfies the dependency-convergence-check test - run: mvn -B -V -ntp verify -Dcheckstyle.skip - working-directory: dependency-convergence-check + - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - name: Install the BOM to local Maven repository + run: .kokoro/build.sh + - name: Check the BOM content satisfies the dependency-convergence-check test + run: mvn -B -V -ntp verify -Dcheckstyle.skip + working-directory: dependency-convergence-check From 40cf24523b92d9fc0d6673002a729c4f7c609630 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Wed, 1 Mar 2023 16:22:29 +0000 Subject: [PATCH 2/4] deps: Update auth to 1.12.2 (#1012) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 4346ed7b..8f5d17a6 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -64,7 +64,7 @@ 2.2.2 2.10.0 2.8.27 - 1.12.1 + 1.12.2 1.42.3 1.34.1 2.0.1 From d687573c163f202060ea4b0f8533e18601a3ddfe Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:30:13 +0000 Subject: [PATCH 3/4] chore(3.0.x): release 3.0.7-SNAPSHOT (#1013) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- dependency-convergence-check/pom.xml | 4 ++-- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dependency-convergence-check/pom.xml b/dependency-convergence-check/pom.xml index 1651aee4..0d3708af 100644 --- a/dependency-convergence-check/pom.xml +++ b/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.0.6 + 3.0.7-SNAPSHOT Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -46,7 +46,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.6 + 3.0.7-SNAPSHOT pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 8f5d17a6..df1b3b34 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.0.6 + 3.0.7-SNAPSHOT Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index cbf68bca..2d286e39 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.0.6 + 3.0.7-SNAPSHOT first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 3.0.6 + 3.0.7-SNAPSHOT pom import com.google.cloud third-party-dependencies - 3.0.6 + 3.0.7-SNAPSHOT pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index ab70eb41..b36204ba 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.0.6 + 3.0.7-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 f7e978ed..d83687cd 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 - 3.0.6 + 3.0.7-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 - 3.0.6 + 3.0.7-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index 69c2f702..d453f060 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:3.0.6:3.0.6 +google-cloud-shared-dependencies:3.0.6:3.0.7-SNAPSHOT From c941863d75aa521f960e90136b23e05c08337424 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:36:13 +0000 Subject: [PATCH 4/4] chore(3.0.x): release 3.0.7 (#1014) :robot: I have created a release *beep* *boop* --- ## [3.0.7](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.6...v3.0.7) (2023-03-01) ### Dependencies * Update auth to 1.12.2 ([#1012](https://togithub.com/googleapis/java-shared-dependencies/issues/1012)) ([40cf245](https://togithub.com/googleapis/java-shared-dependencies/commit/40cf24523b92d9fc0d6673002a729c4f7c609630)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ dependency-convergence-check/pom.xml | 4 ++-- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad33908a..67439168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog +## [3.0.7](https://github.com/googleapis/java-shared-dependencies/compare/v3.0.6...v3.0.7) (2023-03-01) + + +### Dependencies + +* Update auth to 1.12.2 ([#1012](https://github.com/googleapis/java-shared-dependencies/issues/1012)) ([40cf245](https://github.com/googleapis/java-shared-dependencies/commit/40cf24523b92d9fc0d6673002a729c4f7c609630)) + ## [3.0.6](https://github.com/googleapis/java-shared-dependencies/compare/v3.0.5...v3.0.6) (2022-11-07) diff --git a/dependency-convergence-check/pom.xml b/dependency-convergence-check/pom.xml index 0d3708af..5a012196 100644 --- a/dependency-convergence-check/pom.xml +++ b/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.0.7-SNAPSHOT + 3.0.7 Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -46,7 +46,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.7-SNAPSHOT + 3.0.7 pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index df1b3b34..98bf3036 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.0.7-SNAPSHOT + 3.0.7 Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index 2d286e39..3b617428 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.0.7-SNAPSHOT + 3.0.7 first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 3.0.7-SNAPSHOT + 3.0.7 pom import com.google.cloud third-party-dependencies - 3.0.7-SNAPSHOT + 3.0.7 pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index b36204ba..23ce1a1b 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.0.7-SNAPSHOT + 3.0.7 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 d83687cd..cb192a57 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 - 3.0.7-SNAPSHOT + 3.0.7 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 - 3.0.7-SNAPSHOT + 3.0.7 pom import diff --git a/versions.txt b/versions.txt index d453f060..c08c0df0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:3.0.6:3.0.7-SNAPSHOT +google-cloud-shared-dependencies:3.0.7:3.0.7