From 1ea0b9a637e16750f346929887173c16eff80346 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Fri, 13 Jan 2023 10:13:23 -0800 Subject: [PATCH] Boil down CI workflow --- .github/workflows/ci.yml | 111 +-------------------------------------- 1 file changed, 2 insertions(+), 109 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d3ce75..1d83523 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,49 +11,9 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - run: sudo apt install fish zsh - - uses: actions/download-artifact@v3 - with: - name: nix-installer-x86_64-linux - - name: Move & set executable - run: | - chmod +x ./nix-installer - mkdir install-root - cp nix-installer.sh install-root/nix-installer.sh - mv nix-installer install-root/nix-installer-x86_64-linux - - name: Initial install + - name: Install Nix uses: ./ with: - local-root: install-root/ - logger: pretty - log-directives: nix_installer=trace - backtrace: full - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Initial uninstall (without a `nix run` first) - run: sudo -E /nix/nix-installer uninstall - env: - NIX_INSTALLER_NO_CONFIRM: true - NIX_INSTALLER_LOGGER: pretty - NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=trace - RUST_BACKTRACE: full - - name: Ensure `nix` is removed - run: | - if systemctl is-active nix-daemon.socket; then - echo "nix-daemon.socket was still running" - exit 1 - fi - if systemctl is-active nix-daemon.service; then - echo "nix-daemon.service was still running" - exit 1 - fi - if [ -e /nix ]; then - echo "/nix exists" - exit 1 - fi - - name: Repeated install - uses: ./ - with: - local-root: install-root/ logger: pretty log-directives: nix_installer=trace backtrace: full @@ -76,71 +36,15 @@ jobs: run: nix-instantiate -E 'builtins.currentTime' --eval if: success() || failure() shell: sh -l {0} - - name: Test zsh - run: nix-instantiate -E 'builtins.currentTime' --eval - if: success() || failure() - shell: zsh --login --interactive {0} - - name: Test fish - run: nix-instantiate -E 'builtins.currentTime' --eval - if: success() || failure() - shell: fish --login {0} - - name: Repeated uninstall - run: sudo -E /nix/nix-installer uninstall - env: - NIX_INSTALLER_NO_CONFIRM: true - NIX_INSTALLER_LOGGER: pretty - NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=trace - RUST_BACKTRACE: full - - name: Ensure `nix` is removed - run: | - if systemctl is-active nix-daemon.socket; then - echo "nix-daemon.socket was still running" - exit 1 - fi - if systemctl is-active nix-daemon.service; then - echo "nix-daemon.service was still running" - exit 1 - fi - if [ -e /nix ]; then - echo "/nix exists" - exit 1 - fi - run-x86_64-darwin: name: Run x86_64 Darwin runs-on: macos-12 steps: - uses: actions/checkout@v3 - - run: brew install fish coreutils - - uses: actions/download-artifact@v3 - with: - name: nix-installer-x86_64-darwin - - name: Move & set executable - run: | - chmod +x ./nix-installer - mkdir install-root - cp nix-installer.sh install-root/nix-installer.sh - mv nix-installer install-root/nix-installer-x86_64-darwin - - name: Initial install + - name: Install Nix uses: ./ with: - local-root: install-root/ - logger: pretty - log-directives: nix_installer=trace - backtrace: full - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Initial uninstall (without a `nix run` first) - run: sudo -E /nix/nix-installer uninstall - env: - NIX_INSTALLER_NO_CONFIRM: true - NIX_INSTALLER_LOGGER: pretty - NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=trace - RUST_BACKTRACE: full - - name: Repeated install - uses: ./ - with: - local-root: install-root/ logger: pretty log-directives: nix_installer=trace backtrace: full @@ -167,15 +71,4 @@ jobs: run: nix-instantiate -E 'builtins.currentTime' --eval if: success() || failure() shell: zsh --login --interactive {0} - - name: Test fish - run: nix-instantiate -E 'builtins.currentTime' --eval - if: success() || failure() - shell: fish --login {0} - - name: Repeated uninstall - run: sudo -E /nix/nix-installer uninstall - env: - NIX_INSTALLER_NO_CONFIRM: true - NIX_INSTALLER_LOGGER: pretty - NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=trace - RUST_BACKTRACE: full \ No newline at end of file