devenv: Use NIX_USER_CONF_FILES to set caches.
#12265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This stacks, rather than overwrites.
The "extra-" prefix tells Nix to append. We also switch to non-deprecated configuration keys. CHANGELOG_BEGIN CHANGELOG_END
ghost
requested a review
from 
cocreature
reviewed
Jan 5, 2022
ghost
changed the title
NIX_USER_CONF_FILES to set caches.NIX_USER_CONF_FILES to set caches.
garyverhaegen-da
added a commit
that referenced
this pull request
Jan 10, 2022
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
added a commit
that referenced
this pull request
Jan 10, 2022
Merged
garyverhaegen-da
added a commit
that referenced
this pull request
Jan 10, 2022
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
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This means that configs stack, rather than being clobbered.
I also updated the configuration file itself so it appends cache information, rather than overwriting, using the "extra-" prefix.
Pull Request Checklist
CHANGELOG_BEGINandCHANGELOG_ENDtagsNOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines runtotrigger the build.