From f2ea69c18249a254c928dd5386dff690acfe73a1 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 9 Jun 2023 17:45:22 +1200 Subject: [PATCH] Revert "Avoid building in GHA" (#73) This reverts commit 43d7fb43e58a8bc4e35e72f00786633e3387c4d8. It turns out that we need to build the `plan-nix` derivations as they are not cached. --- .github/workflows/main.yml | 2 +- extra/ghcr-upload.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7bca06e..346cac3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: # fixed output of the derivation is already in the `/nix/store` and will # not try to fetch it using the platform we do not have a builder for. if [[ "${{ matrix.platform }}" != "x86_64-linux" && "${{ matrix.target-platform }}" = "-js" ]]; then - nix build --builders "" --max-jobs 0 ".#hydraJobs.x86_64-linux.${{ matrix.compiler-nix-name }}-js-minimal" --show-trace + nix build ".#hydraJobs.x86_64-linux.${{ matrix.compiler-nix-name }}-js-minimal" --show-trace fi - name: Compute and upload closure and developer environment to ghcr.io env: diff --git a/extra/ghcr-upload.sh b/extra/ghcr-upload.sh index 954fdb6..db41a0f 100755 --- a/extra/ghcr-upload.sh +++ b/extra/ghcr-upload.sh @@ -2,6 +2,6 @@ #! nix-shell -i bash -p zstd -p oras set -euox pipefail -nix build --builders "" --max-jobs 0 ".#hydraJobs.${DEV_SHELL}" --show-trace +nix build ".#hydraJobs.${DEV_SHELL}" --show-trace nix-store --export $(nix-store -qR result) | zstd -z8T8 >${DEV_SHELL} oras push ghcr.io/input-output-hk/devx:${DEV_SHELL} ${DEV_SHELL}