diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f5167834..f1faeb505 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,13 +81,13 @@ jobs: with: name: installer-${{matrix.os}} path: out - - name: Serving installer - id: serving_installer - run: ./scripts/serve-installer-for-github-actions + - name: Looking up the installer tarball URL + id: installer-tarball-url + run: echo "installer-url=file://$GITHUB_WORKSPACE/out" >> "$GITHUB_OUTPUT" - uses: cachix/install-nix-action@v31 with: - install_url: 'http://localhost:8126/install' - install_options: "--tarball-url-prefix http://localhost:8126/" + install_url: ${{ format('{0}/install', steps.installer-tarball-url.outputs.installer-url) }} + install_options: ${{ format('--tarball-url-prefix {0}', steps.installer-tarball-url.outputs.installer-url) }} - run: sudo apt install fish zsh if: matrix.os == 'linux' - run: brew install fish diff --git a/scripts/serve-installer-for-github-actions b/scripts/serve-installer-for-github-actions deleted file mode 100755 index 2efd2aa32..000000000 --- a/scripts/serve-installer-for-github-actions +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -if [[ ! -d out ]]; then - echo "run prepare-installer-for-github-actions first" - exit 1 -fi -cd out -PORT=${PORT:-8126} -nohup python -m http.server "$PORT" >/dev/null 2>&1 & -pid=$! - -while ! curl -s "http://localhost:$PORT"; do - sleep 1 - if ! kill -0 $pid; then - echo "Failed to start http server" - exit 1 - fi -done - -echo 'To install nix, run the following command:' -echo "sh <(curl http://localhost:$PORT/install) --tarball-url-prefix http://localhost:$PORT"