From c8ff36ea68657afec1c1e5ade4133a5808922b01 Mon Sep 17 00:00:00 2001
From: Tom Foster <tom@tcpip.uk>
Date: Tue, 23 Apr 2024 16:50:07 +0100
Subject: [PATCH] Combine extra nix config lines

---
 .github/workflows/ci.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cdfa1d8f..0ed874ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,16 +42,8 @@ jobs:
               run: |
                   sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
                   experimental-features = nix-command flakes
-                  extra-substituters = https://nix-community.cachix.org
-                  extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
-                  extra-substituters = https://crane.cachix.org
-                  extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
-                  extra-substituters = https://nix.computer.surgery/conduit
-                  extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit
-                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
-                  extra-substituters = https://attic.kennel.juneis.dog/conduwuit
-                  extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
+                  extra-substituters = https://nix-community.cachix.org https://crane.cachix.org https://nix.computer.surgery/conduit https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
+                  extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk= conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo= conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                   EOF
 
             - name: Add alternative Nix binary caches if specified
@@ -76,18 +68,6 @@ jobs:
               run: |
                   direnv exec . engage
 
-            - name: Pre-build x86_64 dependencies
-              run: >
-                  bin/nix-build-and-cache
-                  .#rocksdb-static-x86_64-unknown-linux-musl
-                  .#conduit-deps-static-x86_64-unknown-linux-musl
-
-            - name: Pre-build aarch64 dependencies
-              run: >
-                  bin/nix-build-and-cache
-                  .#rocksdb-static-aarch64-unknown-linux-musl
-                  .#conduit-deps-static-aarch64-unknown-linux-musl
-
             - name: Build static targets
               run: >
                   bin/nix-build-and-cache