From ee1be836db82b5fbb8576b89ec10dc34a6ae9d40 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 23 Apr 2024 01:00:43 -0700 Subject: [PATCH] Fix Intellij aspect integration tests setup Adds a dependency on the minimal `@rules_java` version that has the required top level symbols. Also drops testing against Bazel 4 (it is no longer supported, as of Jan 2024, see: https://bazel.build/release#support-matrix) Should turn CI green and unblock the release. Tested: https://buildkite.com/bazel/intellij-plugin-aspect-google/builds/9062 PiperOrigin-RevId: 627296165 --- .../src/com/google/idea/blaze/aspect/integration/BUILD | 1 - .../idea/blaze/aspect/integration/testdata/WORKSPACE | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/BUILD b/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/BUILD index 896b73eadc4..8504bc8cd1d 100644 --- a/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/BUILD +++ b/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/BUILD @@ -20,7 +20,6 @@ java_binary( bazel_integration_tests( name = "bazel_invocation_integration_tests", bazel_versions = [ - "4.0.0", "6.0.0", ], # set tags = [] because otherwise bazel_integration_tests sets diff --git a/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/testdata/WORKSPACE b/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/testdata/WORKSPACE index 92e376e8d0c..eae2adb1da5 100644 --- a/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/testdata/WORKSPACE +++ b/aspect/testing/tests/src/com/google/idea/blaze/aspect/integration/testdata/WORKSPACE @@ -1 +1,8 @@ workspace(name = "testdata") + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +http_archive( + name = "rules_java", + url = "https://github.com/bazelbuild/rules_java/releases/download/5.3.5/rules_java-5.3.5.tar.gz", + sha256 = "c73336802d0b4882e40770666ad055212df4ea62cfa6edf9cb0f9d29828a0934", +)