From cdb558f2cfbeb519913a7c5d19d002aaaca0cf91 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 10 Apr 2023 17:29:11 +1000
Subject: [PATCH] switch to hercules ci

---
 .github/workflows/build.yml |  4 ++--
 bors.toml                   |  9 ++-------
 build-images.sh             | 14 +++++++++-----
 flake.nix                   |  4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1634062..fb758ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,8 +3,8 @@ on:
   repository_dispatch:
   workflow_dispatch:
   push:
-    branches:
-      - main
+    #branches:
+    #  - main
 jobs:
   images:
     strategy:
diff --git a/bors.toml b/bors.toml
index 9247e10..a6bf5e6 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,10 +1,5 @@
 cut_body_after = "" # don't include text from the PR body in the merge commit message
 status = [
-  # garnix
-  "Evaluate flake.nix",
-  "package netboot-nixos-2211 [x86_64-linux]",
-  "package kexec-installer-nixos-2211 [x86_64-linux]",
-  "package kexec-installer-nixos-unstable [x86_64-linux]",
-  "check kexec-installer-unstable [x86_64-linux]",
-  "package netboot-nixos-unstable [x86_64-linux]"
+  "ci/hercules/onPush/default",
+  "ci/hercules/evaluation",
 ]
diff --git a/build-images.sh b/build-images.sh
index b80ec9c..5d239d3 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -26,12 +26,14 @@ build_kexec_installer() {
 }
 
 main() {
-  declare -r tag=${1:-nixos-unstable} arch=${2:-x86_64-linux}
+  declare -r tag=$1
   tmp="$(mktemp -d)"
   trap 'rm -rf -- "$tmp"' EXIT
   (
-    build_kexec_installer "$tag" "$arch" "$tmp"
-    build_netboot_image "$tag" "$arch" "$tmp"
+    for arch in x86_64-linux aarch64-linux; do
+      build_kexec_installer "$tag" "$arch" "$tmp"
+      build_netboot_image "$tag" "$arch" "$tmp"
+    done
   ) | readarray -t assets
   for asset in "${assets[@]}"; do
     pushd "$(dirname "$asset")"
@@ -40,9 +42,11 @@ main() {
   done
   assets+=("$TMP/sha256sums")
 
+  cat "${TMP}/sha256sums"
+
   # Since we cannot atomically update a release, we delete the old one before
-  gh release delete "$tag" </dev/null || true
-  gh release create --title "$tag (build $(date +"%Y-%m-%d"))" "$tag" "${assets[@]}" </dev/null
+  #gh release delete "$tag" </dev/null || true
+  #gh release create --title "$tag (build $(date +"%Y-%m-%d"))" "$tag" "${assets[@]}" </dev/null
 }
 
 main "$@"
diff --git a/flake.nix b/flake.nix
index e07a818..3700e4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,10 +5,10 @@
   inputs.nixos-2211.url = "github:NixOS/nixpkgs/release-22.11";
 
   nixConfig.extra-substituters = [
-    "https://cache.garnix.io"
+    "https://nix-community.cachix.org"
   ];
   nixConfig.extra-trusted-public-keys = [
-    "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+    "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
   ];
 
   outputs = { self, nixos-unstable, nixos-2211 }: let