digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-11-13 00:16:19 +03:00
Code Issues Projects Releases Wiki Activity

restore terraform to working state (#6402)

Browse Source 
It looks like some nix update has broken our current Terraform setup.
The Google provider plugin has changed its reported version to 0.0.0;
poking at my local nix store seems to indicate we actually get 3.15, but
🤷.

This PR also reverts the infra part of #6400 so we get back to master ==
reality.

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Gary Verhaegen 2020-06-18 12:15:27 +02:00 committed by GitHub
parent 2c1d4cb805
commit fba57470a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/macos/2-vagrant-files/init.sh
View File

@ -136,7 +136,7 @@ log "Created /nix partition."
su -l vsts <<'END' su -l vsts <<'END'
set -euo pipefail set -euo pipefail
export PATH="/usr/local/bin:/usr/sbin:$PATH" export PATH="/usr/local/bin:/usr/sbin:$PATH"
bash <(curl -sSfL https://nixos.org/nix/install) bash <(curl https://nixos.org/nix/install)
echo "build:darwin --disk_cache=~/.bazel-cache" > ~/.bazelrc echo "build:darwin --disk_cache=~/.bazel-cache" > ~/.bazelrc
END END

2
infra/main.tf
View File

@ -11,13 +11,11 @@ terraform {
provider "google" { provider "google" {
project = "da-dev-gcp-daml-language" project = "da-dev-gcp-daml-language"
region = "us-east4" region = "us-east4"
version = "3.5"
} }
provider "google-beta" { provider "google-beta" {
project = "da-dev-gcp-daml-language" project = "da-dev-gcp-daml-language"
region = "us-east4" region = "us-east4"
version = "3.5"
} }
provider "secret" { provider "secret" {

2
infra/vsts_agent_linux_startup.sh
View File

@ -146,7 +146,7 @@ chown --recursive root:root /home/vsts/agent/{*.sh,bin,externals}
# This needs to run inside of a user with sudo access # This needs to run inside of a user with sudo access
echo "vsts ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers.d/nix_installation echo "vsts ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers.d/nix_installation
su --command "sh <(curl -sSfL https://nixos.org/nix/install) --daemon" --login vsts su --command "sh <(curl https://nixos.org/nix/install) --daemon" --login vsts
rm /etc/sudoers.d/nix_installation rm /etc/sudoers.d/nix_installation
# Note: the "hydra.da-int.net" string is now part of the name of the key for # Note: the "hydra.da-int.net" string is now part of the name of the key for