diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 4672178..bd3fe48 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -101,17 +101,6 @@ jobs: env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # Uploaded before any build so the substituter answers from the very - # first config instead of only after the first push. - - name: Publish nix-cache-info - run: | - printf 'StoreDir: /nix/store\nWantMassQuery: 1\nPriority: 100\n' \ - | aws s3 cp - "s3://icedos-nix-cache-fyi/nix-cache-info" --region eu-central-1 - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: eu-central-1 - AWS_DEFAULT_REGION: eu-central-1 - name: Test cache server run: | # A missing path must answer 403/404 through CloudFront + Cloudflare. diff --git a/build.sh b/build.sh index 8364348..7a2ab76 100644 --- a/build.sh +++ b/build.sh @@ -217,14 +217,8 @@ build_and_push() { missing_paths=() printf '%s\n' "${closure_paths[@]}" | xargs -P 8 -I{} bash -c ' h=$(basename "{}" | cut -c1-32) - code=000 - for i in 1 2 3; do - code=$(curl -s -o /dev/null -w "%{http_code}" --head --max-time 20 "https://cache.nixos.org/$h.narinfo") - [ "$code" = 000 ] || break - sleep $((i * 2)) - done - # a failed probe is not proof of absence; pushing beats permanent skip - [ "$code" = 200 ] || printf "%s\n" "{}" + code=$(curl -s -o /dev/null -w "%{http_code}" --head --max-time 20 "https://cache.nixos.org/$h.narinfo") + [ "$code" != 200 ] && printf "%s\n" "{}" ' >"$out/missing-paths" || true mapfile -t missing_paths < "$out/missing-paths" echo "$cfg: $((${#closure_paths[@]} - ${#missing_paths[@]})) paths in upstream, pushing ${#missing_paths[@]}" diff --git a/flake.lock b/flake.lock index 79b5748..3f10e85 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "cache-server": { "flake": false, "locked": { - "lastModified": 1787752985, - "narHash": "sha256-7JWxzkZ+u9lP2wvBQ+256cUhGLcGfFhHZXjcV3Gcs6U=", + "lastModified": 1788115329, + "narHash": "sha256-SpIoKmz7x0EDuyTm7jUbcOc5ni1ErEt7oQbHWgV4sYs=", "owner": "icedos", "repo": "cache-server", - "rev": "30c17556cdabb624109eef1cd9ab03b63520eadd", + "rev": "3a94743c003eb15a11b248c651ab77baecd74909", "type": "github" }, "original": { "owner": "icedos", - "ref": "key", + "ref": "cache", "repo": "cache-server", "type": "github" } @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1787849045, - "narHash": "sha256-8FuFltMbLSJ4p/IjFHwE0D9QgA/d05QnGXJQ/FdbdsA=", + "lastModified": 1788125528, + "narHash": "sha256-7VoNdIPU5zlpD/uH+BLcf+tXoqFHLQwT7o5QmLfL23Y=", "owner": "IceDOS", "repo": "core", - "rev": "09a566fd23b4622fce3168216c5530a04fdce157", + "rev": "886127d7a0878d4326100768fa3cf48b53af1a16", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1787736819, - "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", + "lastModified": 1788039129, + "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3", + "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", "type": "github" }, "original": { diff --git a/state/tracked-inputs.json b/state/tracked-inputs.json index c2eef8a..2f5bd5e 100644 --- a/state/tracked-inputs.json +++ b/state/tracked-inputs.json @@ -1,7 +1,13 @@ { - "nix-cachyos-kernel": "290b62ec266d15827ab79852483e434eeba912e0", + "nix-cachyos-kernel": { + "rev": "f39e7d511ce7c2c95a12b828b72d9463f329e68b", + "repo": "" + }, "ambiled": "8a9a9042f77129ea5aded8a98f0804a673332c1b", "prefixer": "b7c0a01125ad1b908363d70a51731ad7303ede5e", - "plasmazones": "26fc9144b08591a371b64b9d36cc74ba233bd241", + "plasmazones": { + "rev": "f2c70b4323f1726ff283404c0e484004d9967275", + "repo": "" + }, "jovian": "9ffc5dc5af266c2e44066f22e5496274cf93a1a6" }