Skip to content

Update turbine#14059

Closed
cushon wants to merge 1 commit intobazelbuild:masterfrom
cushon:turbine
Closed

Update turbine#14059
cushon wants to merge 1 commit intobazelbuild:masterfrom
cushon:turbine

Conversation

@cushon
Copy link
Copy Markdown
Contributor

@cushon cushon commented Sep 29, 2021

@cushon cushon requested review from comius and philwo September 29, 2021 13:47
@google-cla google-cla Bot added the cla: yes label Sep 29, 2021
@bazel-io bazel-io closed this in 89b9a04 Sep 29, 2021
@philwo
Copy link
Copy Markdown
Member

philwo commented Sep 29, 2021

Sorry, I had to revert this (and should have waited for the presubmit tests to complete...), because it breaks some tests: https://buildkite.com/bazel/bazel-bazel/builds/17471

@cushon cushon reopened this Sep 29, 2021
@cushon
Copy link
Copy Markdown
Contributor Author

cushon commented Sep 29, 2021

Sorry about that, and thanks for taking care of the rollback.

I think this has exposed an issue with those tests, I mailed cl/399718766 to prepare them for this change.

@cushon
Copy link
Copy Markdown
Contributor Author

cushon commented Sep 29, 2021

The CI is passing with the pending change to src/test/shell/bazel/bazel_java_test.sh patched in, I'll submit that and then update the PR to be just the turbine change

bazel-io pushed a commit that referenced this pull request Sep 29, 2021
e.g. for ` //src/test/shell/bazel:bazel_java_test_jdk16_toolchain_head`,
this test was previously using `@bazel_tools//tools/jdk:toolchain`, which
was leaking the toolchain from the enclosing version of Bazel. It worked
anyways because turbine was always producing JDK 8 class files, but as of
google/turbine@006a74b
turbine uses the class file version corresponding to the `-target` or
`--release` flag.

This fixes e.g.

```
java/com/google/sandwich/B.java:3: error: cannot access C
  C myObject;
  ^
  bad class file: bazel-out/k8-fastbuild/bin/java/com/google/sandwich/libbottom-hjar.jar(/com/google/sandwich/C.class)
    class file has wrong version 59.0, should be 55.0
    Please remove or make sure it appears in the correct subdirectory of the classpath.
```

from #14059

PiperOrigin-RevId: 399738050
@cushon cushon mentioned this pull request Sep 30, 2021
@comius
Copy link
Copy Markdown
Contributor

comius commented Oct 4, 2021

@philwo This PR is ready for a manual merge.

@bazel-io bazel-io closed this in 69b4362 Oct 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants