Browse Source

Revert "feat: add new attic cache"

This reverts commit a54291ac7e.
merge-requests/762/head
Matthias Ahouansou 9 months ago
parent
commit
5c8b030c1e
No known key found for this signature in database
  1. 4
      .gitlab-ci.yml
  2. 2
      bin/nix-build-and-cache

4
.gitlab-ci.yml

@ -25,8 +25,8 @@ before_script:
- if command -v nix > /dev/null; then echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf; fi
# Add our own binary cache
- if command -v nix > /dev/null; then echo "extra-substituters = https://attic.mnzn.dev/conduit" >> /etc/nix/nix.conf; fi
- if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:pkmOYsJpoYy5y4Ws5sILt/O5XVzp0fXdxkW2Tqk0K/c=" >> /etc/nix/nix.conf; fi
- if command -v nix > /dev/null; then echo "extra-substituters = https://attic.conduit.rs/conduit" >> /etc/nix/nix.conf; fi
- if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:zXpsVmtm+MBbweaCaG/CT4pCEDDjfFAKjgbCqfDBjLE=" >> /etc/nix/nix.conf; fi
# Add alternate binary cache
- if command -v nix > /dev/null && [ -n "$ATTIC_ENDPOINT" ]; then echo "extra-substituters = $ATTIC_ENDPOINT" >> /etc/nix/nix.conf; fi

2
bin/nix-build-and-cache

@ -14,7 +14,7 @@ if [ ! -z ${ATTIC_TOKEN+x} ]; then
nix run --inputs-from . attic -- \
login \
conduit \
"${ATTIC_ENDPOINT:-https://attic.mnzn.dev/conduit}" \
"${ATTIC_ENDPOINT:-https://attic.conduit.rs/conduit}" \
"$ATTIC_TOKEN"
readarray -t derivations < <(nix path-info "$@" --derivation)

Loading…
Cancel
Save