ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 07:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid Cachix until we recover the onwership on that cache

Browse Source 
Co-authored-by: Florian Sesser <florian@leastauthority.com>
Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
This commit is contained in:
Benoit Donneaux 2024-12-05 11:09:04 +01:00
parent a46c41cb28
commit 19aa0cd1c2
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -602,7 +602,7 @@ jobs:
# can use to override the default nixpkgs input. # can use to override the default nixpkgs input.
NIXPKGS=$(nixpkgs_flake_reference <<parameters.nixpkgs>>) NIXPKGS=$(nixpkgs_flake_reference <<parameters.nixpkgs>>)
cache_if_able nix run \ nix run \
--override-input nixpkgs "$NIXPKGS" \ --override-input nixpkgs "$NIXPKGS" \
.#<<parameters.pythonVersion>>-unittest -- \ .#<<parameters.pythonVersion>>-unittest -- \
--jobs $UNITTEST_CORES \ --jobs $UNITTEST_CORES \
@ -743,10 +743,6 @@ executors:
- <<: *DOCKERHUB_AUTH - <<: *DOCKERHUB_AUTH
image: "nixos/nix:2.16.1" image: "nixos/nix:2.16.1"
environment: environment:
# CACHIX_AUTH_TOKEN is manually set in the CircleCI web UI and allows us
# to push to CACHIX_NAME. CACHIX_NAME tells cachix which cache to push
# to.
CACHIX_NAME: "tahoe-lafs-opensource"
# Let us use features marked "experimental". For example, most/all of # Let us use features marked "experimental". For example, most/all of
# the `nix <subcommand>` forms. # the `nix <subcommand>` forms.
NIX_CONFIG: "experimental-features = nix-command flakes" NIX_CONFIG: "experimental-features = nix-command flakes"
@ -770,7 +766,6 @@ commands:
steps: steps:
- "run": - "run":
# Get cachix for Nix-friendly caching.
name: "Install Basic Dependencies" name: "Install Basic Dependencies"
command: | command: |
# Get some build environment dependencies and let them float on a # Get some build environment dependencies and let them float on a
@ -778,12 +773,7 @@ commands:
# package build (only in CI environment setup) so the fact that # package build (only in CI environment setup) so the fact that
# they float shouldn't hurt reproducibility. # they float shouldn't hurt reproducibility.
NIXPKGS="nixpkgs/nixos-23.05" NIXPKGS="nixpkgs/nixos-23.05"
nix profile install $NIXPKGS#cachix $NIXPKGS#bash $NIXPKGS#jp nix profile install $NIXPKGS#bash $NIXPKGS#jp
# Activate our cachix cache for "binary substitution". This sets
# up configuration tht lets Nix download something from the cache
# instead of building it locally, if possible.
cachix use "${CACHIX_NAME}"
- "checkout" - "checkout"
@ -800,7 +790,7 @@ commands:
command: | command: |
source .circleci/lib.sh source .circleci/lib.sh
NIXPKGS=$(nixpkgs_flake_reference <<parameters.nixpkgs>>) NIXPKGS=$(nixpkgs_flake_reference <<parameters.nixpkgs>>)
cache_if_able nix build \ nix build \
--verbose \ --verbose \
--print-build-logs \ --print-build-logs \
--cores "$DEPENDENCY_CORES" \ --cores "$DEPENDENCY_CORES" \

8
flake.nix
View File

@ -1,14 +1,6 @@
{ {
description = "Tahoe-LAFS, free and open decentralized data store"; description = "Tahoe-LAFS, free and open decentralized data store";
nixConfig = {
# Supply configuration for the build cache updated by our CI system. This
# should allow most users to avoid having to build a large number of
# packages (otherwise necessary due to our Python package overrides).
substituters = ["https://tahoe-lafs-opensource.cachix.org"];
trusted-public-keys = ["tahoe-lafs-opensource.cachix.org-1:eIKCHOPJYceJ2gb74l6e0mayuSdXqiavxYeAio0LFGo="];
};
inputs = { inputs = {
# A couple possible nixpkgs pins. Ideally these could be selected easily # A couple possible nixpkgs pins. Ideally these could be selected easily
# from the command line but there seems to be no syntax/support for that. # from the command line but there seems to be no syntax/support for that.