Skip to content

Commit 2d3970f

Browse files
Internal change
PiperOrigin-RevId: 850094201
1 parent acffab7 commit 2d3970f

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.github/workflows/test_java.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ jobs:
7777
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} --test_env=KOKORO_JAVA_VERSION
7878

7979
# TODO restore this test (or a better one) when gRPC has rebuilt with 26.x
80-
# linkage-monitor:
81-
# name: Linux Linkage Monitor
82-
# runs-on: ubuntu-latest
83-
# steps:
84-
# - name: Checkout pending changes
85-
# uses: protocolbuffers/protobuf-ci/checkout@v5
86-
# with:
87-
# ref: ${{ inputs.safe-checkout }}
88-
# - name: Run Linkage Monitor test
89-
# uses: protocolbuffers/protobuf-ci/bazel-docker@v5
90-
# with:
91-
# image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
92-
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
93-
# bazel-cache: java_linux/8
94-
# # TODO: b/318555165 - enable the layering check. Currently it does
95-
# # not work correctly with the toolchain in this Docker image.
96-
# bazel: test --test_output=all //java:linkage_monitor --spawn_strategy=standalone --features=-layering_check
80+
linkage-monitor:
81+
name: Linux Linkage Monitor
82+
runs-on: ubuntu-latest
83+
steps:
84+
- name: Checkout pending changes
85+
uses: protocolbuffers/protobuf-ci/checkout@v5
86+
with:
87+
ref: ${{ inputs.safe-checkout }}
88+
- name: Run Linkage Monitor test
89+
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
90+
with:
91+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8.0.1-8-b77fdae6d4771789dfc66a56bf8d806354e8011a
92+
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
93+
bazel-cache: java_linux/8
94+
# TODO: b/318555165 - enable the layering check. Currently it does
95+
# not work correctly with the toolchain in this Docker image.
96+
bazel: test --test_output=all //java:linkage_monitor --spawn_strategy=standalone --features=-layering_check
9797

9898
protobuf-bom:
9999
name: Protobuf Maven BOM

java/linkage_monitor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mvn -e -B clean generate-sources install \
3232

3333
echo "Installed the artifacts to local Maven repository"
3434

35-
curl -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/linkage-monitor-latest-all-deps.jar"
35+
curl -O "https://github.com/GoogleCloudPlatform/cloud-opensource-java/releases/download/dependencies-v1.5.15/linkage-monitor-latest-all-deps.jar"
3636

3737
echo "Running linkage-monitor-latest-all-deps.jar."
3838

0 commit comments

Comments
 (0)