From cf6d18b1f1df40cb4f095e2d845f873c5e320370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 25 Dec 2022 23:23:34 +0000 Subject: [PATCH] use object storage as substituter --- .woodpecker/sync.yml | 8 ++++---- .woodpecker/test.yml | 6 +++--- nixos/distributed-builds.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker/sync.yml b/.woodpecker/sync.yml index 01829e9e..965e6664 100644 --- a/.woodpecker/sync.yml +++ b/.woodpecker/sync.yml @@ -4,11 +4,11 @@ pipeline: image: nixpkgs/nix-flakes:latest pull: true commands: - - nix develop --no-sandbox -c git lfs fetch --all - - nix develop --no-sandbox -c git fetch --unshallow origin - - nix develop --no-sandbox -c git remote add github https://cyplo:$GITHUB_TOKEN@github.com/cyplo/dotfiles.git - - nix develop --no-sandbox -c git push github --all --force - export AWS_ACCESS_KEY_ID="nix-builder" - export AWS_SECRET_ACCESS_KEY="$MINIO_NIX_BUILDER_KEY" + - nix develop --substituters 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' --no-sandbox -c git lfs fetch --all + - nix develop --substituters 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' --no-sandbox -c git fetch --unshallow origin + - nix develop --substituters 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' --no-sandbox -c git remote add github https://cyplo:$GITHUB_TOKEN@github.com/cyplo/dotfiles.git + - nix develop --substituters 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' --no-sandbox -c git push github --all --force - nix copy --all --to 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' secrets: [ github_token , minio_nix_builder_key ] diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 552b1998..695221be 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -4,10 +4,10 @@ pipeline: image: nixpkgs/nix-flakes:latest pull: true commands: - - time nix flake metadata - - time nix --no-sandbox develop -c statix check - - time nix flake check - export AWS_ACCESS_KEY_ID="nix-builder" - export AWS_SECRET_ACCESS_KEY="$MINIO_NIX_BUILDER_KEY" + - time nix flake metadata + - time nix --no-sandbox --substituters 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' develop -c statix check + - time nix --substituters 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' flake check - nix copy --all --to 's3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev' secrets: [ minio_nix_builder_key ] diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix index b189ed5f..6d0fd74f 100644 --- a/nixos/distributed-builds.nix +++ b/nixos/distributed-builds.nix @@ -27,5 +27,5 @@ builders-use-substitutes = true ''; nix.distributedBuilds = true; - nix.settings.substituters = ["nix-builder@bolty" "https://cache.nixos.org/"]; + nix.settings.substituters = ["s3://nix-store?endpoint=objects.cyplo.dev&scheme=https®ion=cyplodev" "https://cache.nixos.org/"]; }