diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 66dd7f5aed7a..36a7bd06ad41 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -64,9 +64,6 @@ jobs: lint: runs-on: ubuntu-latest steps: - - name: Get current week within the year - id: date - run: echo "::set-output name=week_of_year::$(date +'%W' --utc)" - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -75,17 +72,11 @@ jobs: distribution: temurin java-version: 17 - run: java -version - - uses: actions/cache@v4 - id: mvn-cache - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }} - - run: java -version - run: .kokoro/build.sh env: JOB_TYPE: lint - HEAD_BRANCH: ${{ github.head_ref }} - BASE_BRANCH: ${{ github.base_ref }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + BASE_SHA: ${{ github.event.pull_request.base.sha }} enforcer: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index e5d179e48436..141c210f2720 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.49.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.0 with: bom-path: gapic-libraries-bom/pom.xml diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 360ea5c3a7ff..3f95c50e6186 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -93,14 +93,14 @@ case ${JOB_TYPE} in fi ;; lint) - git checkout "${BASE_BRANCH}" - git checkout "${HEAD_BRANCH}" - changed_file_list="$(git diff --name-only "${BASE_BRANCH}" HEAD)" + changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}") + echo "${changed_file_list}" has_code_change="false" while IFS= read -r changed_file; do if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then - has_code_change="true" - break + echo "Matched: ${changed_file}" + has_code_change="true" + break fi done <<< "${changed_file_list}" if [ "${has_code_change}" == "false" ]; then diff --git a/.kokoro/nightly/graalvm-native-a.cfg b/.kokoro/nightly/graalvm-native-a.cfg index 57ff1c9678ad..f035f7111a7e 100644 --- a/.kokoro/nightly/graalvm-native-a.cfg +++ b/.kokoro/nightly/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0" } env_vars: { diff --git a/.kokoro/nightly/graalvm-native-b.cfg b/.kokoro/nightly/graalvm-native-b.cfg index a8140cdd7679..0ffa98965215 100644 --- a/.kokoro/nightly/graalvm-native-b.cfg +++ b/.kokoro/nightly/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.0" } env_vars: { diff --git a/.kokoro/nightly/graalvm-native-c.cfg b/.kokoro/nightly/graalvm-native-c.cfg index e52fe077c102..53958be3397a 100644 --- a/.kokoro/nightly/graalvm-native-c.cfg +++ b/.kokoro/nightly/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.0" } env_vars: { diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg index 59584b7b38a3..8559d2473364 100644 --- a/.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg +++ b/.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg @@ -29,7 +29,7 @@ env_vars: { env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0" } # TODO: remove this after we've migrated all tests and scripts diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg index 097fce1089b2..08e603ac30c8 100644 --- a/.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg +++ b/.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg @@ -24,7 +24,7 @@ env_vars: { env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.0" } env_vars: { diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg index 4147cf5499d4..d2e9c94c74ef 100644 --- a/.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg +++ b/.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg @@ -24,7 +24,7 @@ env_vars: { env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-a-presubmit.cfg b/.kokoro/presubmit/graalvm-native-a-presubmit.cfg index 9d472a4a2677..99b24ca86023 100644 --- a/.kokoro/presubmit/graalvm-native-a-presubmit.cfg +++ b/.kokoro/presubmit/graalvm-native-a-presubmit.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b-presubmit.cfg b/.kokoro/presubmit/graalvm-native-b-presubmit.cfg index 169ec7d0ef3b..186fe1b070b5 100644 --- a/.kokoro/presubmit/graalvm-native-b-presubmit.cfg +++ b/.kokoro/presubmit/graalvm-native-b-presubmit.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c-presubmit.cfg b/.kokoro/presubmit/graalvm-native-c-presubmit.cfg index 83b324c92ba7..be830baa43e7 100644 --- a/.kokoro/presubmit/graalvm-native-c-presubmit.cfg +++ b/.kokoro/presubmit/graalvm-native-c-presubmit.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.0" } env_vars: { diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml index 0d8346bb0388..53792920dff8 100644 --- a/google-cloud-pom-parent/pom.xml +++ b/google-cloud-pom-parent/pom.xml @@ -15,7 +15,7 @@ com.google.cloud sdk-platform-java-config - 3.49.0 + 3.50.0