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.

Sign up for GitHub

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

Jump to bottom

Upgrade nixpkgs #12280

Merged
merged 1 commit into from
Jan 7, 2022
Merged

Upgrade nixpkgs #12280

merged 1 commit into from
Jan 7, 2022

Conversation

cocreature
Copy link
Contributor

This gives us GHC 9.0.2 and a new Bazel release.

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
  • If you mean to change the status of a component, please make sure you keep the Component Status page up to date.

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 cocreature force-pushed the nixpkgs-upgrade-defafc9a220440180a34f923be9772d9c89a8197 branch 3 times, most recently from f818add to 852f4bb Compare January 6, 2022 21:28
@cocreature
Upgrade nixpkgs
9dfc0b5 
This gives us GHC 9.0.2 and a new Bazel release.

changelog_begin
changelog_end
@cocreature cocreature force-pushed the nixpkgs-upgrade-defafc9a220440180a34f923be9772d9c89a8197 branch from 77520f9 to 9dfc0b5 Compare January 7, 2022 14:41
cocreature
cocreature commented Jan 7, 2022
View reviewed changes
deps.bzl
patches = [
"@com_github_digital_asset_daml//bazel_tools:grpc-bazel-mingw.patch",
],
patch_args = ["-p1"],
)

if "com_google_absl" not in native.existing_rules():
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 pulled in by grpc and we don’t need a specific version.

cocreature
cocreature commented Jan 7, 2022
View reviewed changes
deps.bzl
strip_prefix = "grpc-1.42.0",
urls = ["https://github.com/grpc/grpc/archive/v1.42.0.tar.gz"],
sha256 = "b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c",
strip_prefix = "grpc-1.43.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

upgrading to keep it in sync with nix

@cocreature cocreature marked this pull request as ready for review January 7, 2022 15:18
akrmn
akrmn approved these changes Jan 7, 2022
View reviewed changes
Copy link
Contributor

@akrmn akrmn left a comment

Choose a reason for hiding this comment

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

thank you!

@cocreature cocreature enabled auto-merge (squash) January 7, 2022 15:23
@cocreature cocreature merged commit 3b39028 into main Jan 7, 2022
@cocreature cocreature deleted the nixpkgs-upgrade-defafc9a220440180a34f923be9772d9c89a8197 branch January 7, 2022 15:48
garyverhaegen-da added a commit that referenced this pull request Jan 10, 2022
@garyverhaegen-da
fix Terraform
bd1f66d 
Our Terraform configuration has been slightly broken by two recent
changes:

- The nixpkgs upgrade in #12280 means a new version of our GCP plugin
  for Terraform, which as a breaking change added a required argument to
  `google_project_iam_member`. The new version also results in a number
  of smaller changes in the way Terraform handles default arguments, which
  doesn't result in any changes to our configuration files or to the
  behaviour of our deployed infrastructure, but does require re-syncing
  the Terraform state (by running `terraform apply`, which would
  essentially be a no-op if it were not for the next bullet point).
- The nix configuration changes in #12265 have changed the Linux CI
  nodes configuration but have not been deployed yet.

This PR is an audit log of the steps taken to rectfy those and bring us
back to a state where our deployed configuration and our recorded
Terraform state both agree with our current `main` branch tip.

CHANGELOG_BEGIN
CHANGELOG_END
@garyverhaegen-da garyverhaegen-da mentioned this pull request Jan 10, 2022
Merged
garyverhaegen-da added a commit that referenced this pull request Jan 10, 2022
@garyverhaegen-da
Fix terraform (#12333)
9f5a2f9 
Our Terraform configuration has been slightly broken by two recent
changes:

- The nixpkgs upgrade in #12280 means a new version of our GCP plugin
  for Terraform, which as a breaking change added a required argument to
  `google_project_iam_member`. The new version also results in a number
  of smaller changes in the way Terraform handles default arguments, which
  doesn't result in any changes to our configuration files or to the
  behaviour of our deployed infrastructure, but does require re-syncing
  the Terraform state (by running `terraform apply`, which would
  essentially be a no-op if it were not for the next bullet point).
- The nix configuration changes in #12265 have changed the Linux CI
  nodes configuration but have not been deployed yet.

This PR is an audit log of the steps taken to rectfy those and bring us
back to a state where our deployed configuration and our recorded
Terraform state both agree with our current `main` branch tip.

CHANGELOG_BEGIN
CHANGELOG_END
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akrmn akrmn akrmn approved these changes

@garyverhaegen-da garyverhaegen-da Awaiting requested review from garyverhaegen-da

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cocreature @akrmn