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"