From 3b3c75d43078b645a2c22d96a06aead8771295d3 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 25 Mar 2024 15:06:55 +0000 Subject: [PATCH] chore(buildkite): switch to new CI system Signed-off-by: Drew Hess --- .buildkite/pipeline.yaml | 25 +++++++----- .buildkite/primer-wasm.yaml | 2 +- .buildkite/public-cache-push.yaml | 15 +++---- flake.lock | 66 +++++++++++++++---------------- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 4ed9f923c..954870437 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -1,34 +1,39 @@ agents: - public: "true" - os: "linux" + queue: "nix-eval" steps: + - command: nix flake archive .# + label: ":nixos: Archive Nix flake inputs" + agents: + queue: "nix-build" + - command: nix-buildkite - label: ":nixos: :buildkite: Build required CI jobs" + label: ":nixos: :buildkite:" plugins: - - hackworthltd/nix-buildkite#hackworthltd-v10: + - hackworthltd/nix#v1.0.0: file: ci.nix - - - label: ":nixos: Archive Nix flake inputs" - command: nix flake archive .# + agent-tags: queue=nix-build - wait - label: ":nixos: :linux: Cache the Nix shell" command: | nix develop --print-build-logs --profile /tmp/primer --command echo "done" + agents: + queue: "nix-build" - label: ":nixos: :macos: Cache the Nix shell" command: | nix develop --print-build-logs --profile /tmp/primer --command echo "done" agents: + queue: "nix-build" os: "darwin" - label: ":nixos: :buildkite: :stopwatch: Run benchmarks" command: nix-buildkite agents: - public: "benchmarking" + queue: "nix-benchmark" plugins: - - hackworthltd/nix-buildkite#hackworthltd-v10: + - hackworthltd/nix#v1.0.0: file: ci-benchmarks.nix - agent-tags: "public=benchmarking" + agent-tags: queue=nix-benchmark diff --git a/.buildkite/primer-wasm.yaml b/.buildkite/primer-wasm.yaml index 96226e107..6eebfce21 100644 --- a/.buildkite/primer-wasm.yaml +++ b/.buildkite/primer-wasm.yaml @@ -1,5 +1,5 @@ agents: - public: "true" + queue: "nix-build" os: "linux" steps: diff --git a/.buildkite/public-cache-push.yaml b/.buildkite/public-cache-push.yaml index b06f1b151..dd026754e 100644 --- a/.buildkite/public-cache-push.yaml +++ b/.buildkite/public-cache-push.yaml @@ -1,28 +1,23 @@ agents: - public: "true" + queue: "cachix-push" os: "linux" env: CACHIX_CACHE_NAME: hackworthltd - CACHIX_CONFIG_PATH: /var/lib/cachix/hackworthltd/cachix.dhall steps: - label: ":nixos: Archive Nix flake inputs to public cache" - command: nix run github:hackworthltd/hacknix#cachix-archive-flake-inputs .# $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME + command: nix run github:hackworthltd/hacknix#cachix-archive-flake-inputs .# $CACHIX_CACHE_NAME - label: ":nixos: Push project to public cache" - command: nix run github:hackworthltd/hacknix#cachix-push-attr ciJobs $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME - # Limit to 1 such job at a time because this could be very - # bandwidth-intensive, and sustained. - concurrency: 1 - concurrency_group: "primer-cachix-push" + command: nix run github:hackworthltd/hacknix#cachix-push-attr ciJobs $CACHIX_CACHE_NAME - wait - label: ":nixos: :linux: Cache Nix shell to public cache" - command: nix run github:hackworthltd/hacknix#cachix-push-flake-dev-shell primer-dev-shell $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME + command: nix run github:hackworthltd/hacknix#cachix-push-flake-dev-shell primer-dev-shell $CACHIX_CACHE_NAME - label: ":nixos: :macos: Cache Nix shell to public cache" - command: nix run github:hackworthltd/hacknix#cachix-push-flake-dev-shell primer-dev-shell $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME + command: nix run github:hackworthltd/hacknix#cachix-push-flake-dev-shell primer-dev-shell $CACHIX_CACHE_NAME agents: os: "darwin" diff --git a/flake.lock b/flake.lock index 67baee12c..7b02ce87b 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "gitignore-nix": { "flake": false, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1708733281, - "narHash": "sha256-pHADXLrADhdC/mrTXtML8NIzJPDu0Xo0XB7p0Z3iQgE=", + "lastModified": 1711150242, + "narHash": "sha256-rwYvrqq9ii/sY3/mtdFJSvmD5rrczbws3q/mY3ZCNz0=", "owner": "hackworthltd", "repo": "hacknix", - "rev": "bf97dd8b5313558bc6dfd6c2c0863a6ee8a85cfd", + "rev": "0f683b219ed1cc47514a17a505f48d836947e9b8", "type": "github" }, "original": { @@ -697,11 +697,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707707289, - "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -729,11 +729,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1710636348, + "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", "type": "github" }, "original": { @@ -751,11 +751,11 @@ ] }, "locked": { - "lastModified": 1707873059, - "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", + "lastModified": 1711108213, + "narHash": "sha256-Q8cwpA2LQOInqeXVckrfFlbzHB8HOWrYntuOxqn3A3g=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", + "rev": "417a857dfb824e60930881a254dd67d6796f5884", "type": "github" }, "original": { @@ -913,11 +913,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -946,11 +946,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -1050,11 +1050,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": {