Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump JVM on Darwin and force TLS 1.2 #8697

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Bump JVM on Darwin and force TLS 1.2 #8697

merged 1 commit into from
Feb 1, 2021

Conversation

cocreature
Copy link
Contributor

@cocreature cocreature commented Jan 29, 2021

Details are in the comments but this seems to workaround the annoying
tls issues we have been dealing with for the past few days.

changelog_begin
changelog_end

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

@cocreature
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

Details are in the comments but this seems to workaround the annoying
tls issues we have been dealing with for the past few days.

changelog_begin
changelog_end
@cocreature cocreature changed the title debug macos Bump JVM on Darwin and force TLS 1.2 Feb 1, 2021
@@ -8,6 +8,20 @@ let

# package overrides
overrides = _: pkgs: rec {
# nixpkgs ships with a very old version of openjdk on darwin
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don’t think this is actually required but the fact that we are on a pretty old JDK doesn’t inspire confidence and I’d rather not waste time debugging issues that have already been fixed.

@@ -27,7 +41,7 @@ let
# and/or documentation.
(pkgs.fetchurl {
url = "https://patch-diff.githubusercontent.com/raw/bazelbuild/bazel/pull/8983.patch";
sha256 = "1j25bycn9q7536ab3ln6yi6zpzv2b25fwdyxbgnalkpl2dz9idb7";
sha256 = "1qdyqymsylinkdwqhbxbm8bvbyznrdn74n744pi5xhdwb6lw1r8a";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is unrelated, changing the JVM forced a rebuild and needed a hash change because this file has changed upstream. There don’t seem to be any relevant changes and the PR has now been closed (looks like the change has made it into Bazel 4.0) so hopefully it will stay stable until we get to Bazel 4.0 and can drop it.

@cocreature cocreature marked this pull request as ready for review February 1, 2021 12:41
@mergify mergify bot merged commit 310f893 into main Feb 1, 2021
@mergify mergify bot deleted the debug-macos branch February 1, 2021 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants