oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-06-27 16:35:59 +00:00
Code Wiki Activity

Merge branch 'attic' into 'next'

Browse source 
feat: new attic server

See merge request famedly/conduit!757
This commit is contained in:
Samuel Meenzen 2025-06-22 22:29:15 +02:00
commit 95494e2eb4
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

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

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