From 8dd84f3e51e31c96e484419208a27f21c657b32b Mon Sep 17 00:00:00 2001 From: iury fukuda Date: Tue, 9 Aug 2022 06:33:48 -0300 Subject: [PATCH] rollback cache approach --- devShell.nix | 2 +- env/gcp/image | 1 - env/local/image | 1 - scripts/terranix-apply.sh | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 120000 env/gcp/image delete mode 120000 env/local/image diff --git a/devShell.nix b/devShell.nix index 7b8a108..a58c8fa 100644 --- a/devShell.nix +++ b/devShell.nix @@ -8,7 +8,7 @@ let image=$2 nix build --out-link "./env/$env/image" .#$image # add image to cache - git update-index --assume-unchanged env/$env/image + git add -Nf env/$env/image ''; build-qcow = writeScriptBin "build-qcow" '' build local qcow diff --git a/env/gcp/image b/env/gcp/image deleted file mode 120000 index edf545f..0000000 --- a/env/gcp/image +++ /dev/null @@ -1 +0,0 @@ -/nix/store/broken-link \ No newline at end of file diff --git a/env/local/image b/env/local/image deleted file mode 120000 index edf545f..0000000 --- a/env/local/image +++ /dev/null @@ -1 +0,0 @@ -/nix/store/broken-link \ No newline at end of file diff --git a/scripts/terranix-apply.sh b/scripts/terranix-apply.sh index 0f9e573..41bf58f 100755 --- a/scripts/terranix-apply.sh +++ b/scripts/terranix-apply.sh @@ -12,4 +12,4 @@ cp $configFile $chdir/config.tf.json && terraform -chdir=$chdir init && terraform -chdir=$chdir apply && terraform -chdir=$chdir output -json >$chdir/output.json && - git update-index --assume-unchanged $chdir/output.json + git add -Nf $chdir/output.json