From 93b68f80144996450e0a5df9dd571b59eefaad1f Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 17 Dec 2021 14:45:22 -0500
Subject: [PATCH] to get ci setup tools, use nix-shell instead of nix-env
hopefully nix-shell behaves a little more predictably than nix-env wrt NIX_PATH
---
.circleci/config.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc041b7..30b0743 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -169,8 +169,9 @@ jobs:
steps:
- run:
name: "Set up Cachix"
+ shell: "nix-shell -p cachix bash"
command: |
- nix-env -iA nixpkgs.cachix nixpkgs.bash
+ set -eo pipefail
cachix use "${CACHIX_NAME}"
nix path-info --all > /tmp/store-path-pre-build
@@ -196,8 +197,11 @@ jobs:
- run:
name: "Push to Cachix"
+ shell: "nix-shell -p cachix bash"
when: "always"
command: |
+ set -eo pipefail
+
# Cribbed from
# https://circleci.com/blog/managing-secrets-when-you-have-pull-requests-from-outside-contributors/
if [ -n "$CIRCLE_PR_NUMBER" ]; then
--
GitLab