Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Get current week within the year
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qq why did we need to remove these again?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to cache deps for the lint job

id: date
run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged_dependency_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-native-a.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-native-b.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-native-c.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a-presubmit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-b-presubmit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-c-presubmit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.49.0</version>
<version>3.50.0</version>
<relativePath/>
</parent>

Expand Down
Loading