Fixup release test matrix re: dnixd

.github/workflows/build-aarch64-darwin.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Install Nix
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ determinate: true
  - uses: DeterminateSystems/magic-nix-cache-action@main
  with:
  use-gha-cache: false

.github/workflows/build-aarch64-linux.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Install Nix
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ determinate: true
  - uses: DeterminateSystems/magic-nix-cache-action@main
  with:
  use-gha-cache: false

.github/workflows/build-x86_64-darwin.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Install Nix
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ determinate: true
  - uses: DeterminateSystems/magic-nix-cache-action@main
  with:
  use-gha-cache: false

.github/workflows/build-x86_64-linux.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Install Nix
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ determinate: true
  - uses: DeterminateSystems/magic-nix-cache-action@main
  with:
  use-gha-cache: false

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
  - name: Install Nix
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ determinate: true
  - uses: DeterminateSystems/magic-nix-cache-action@main
  with:
  use-gha-cache: false
@@ -62,7 +62,7 @@ jobs:
  needs: [lints, build-x86_64-linux]
  strategy:
  matrix:
- extra-args: ["--determinate", ""]
+ determinate: [true, false]
  permissions:
  id-token: "write"
  contents: "read"
@@ -83,13 +83,20 @@ jobs:
  - name: Initial install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
- extra-args: ${{ matrix.extra-args }}
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
+ logger: pretty
+ - name: "Validate dnixd is ${{ matrix.determinate && 'installed' || 'uninstalled' }}"
+ run: |
+ if test -x /usr/local/bin/determinate-nixd; then
+ echo "determinate-nixd is present"
+ ${{ matrix.determinate }}
+ else
+ echo "determinate-nixd is not present"
+ ${{ !matrix.determinate }}
+ fi
  - name: Initial uninstall (without a `nix run` first)
  run: sudo -E /nix/nix-installer uninstall
  env:
@@ -114,13 +121,11 @@ jobs:
  - name: Repeated install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
- extra-args: ${{ matrix.extra-args }}
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
+ logger: pretty
  - name: echo $PATH
  run: echo $PATH
  - name: Test `nix` with `$GITHUB_PATH`
@@ -175,7 +180,7 @@ jobs:
  needs: [lints, build-x86_64-linux]
  strategy:
  matrix:
- extra-args: ["--determinate", ""]
+ determinate: [true, false]
  permissions:
  id-token: "write"
  contents: "read"
@@ -196,15 +201,22 @@ jobs:
  - name: Initial install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  init: none
- extra-args: ${{ matrix.extra-args }}
- planner: linux
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
+ logger: pretty
+ planner: linux
+ - name: "Validate dnixd is ${{ matrix.determinate && 'installed' || 'uninstalled' }}"
+ run: |
+ if test -x /usr/local/bin/determinate-nixd; then
+ echo "determinate-nixd is present"
+ ${{ matrix.determinate }}
+ else
+ echo "determinate-nixd is not present"
+ ${{ !matrix.determinate }}
+ fi
  - name: Ensure daemon was not configured with init
  run: |
  if systemctl is-active nix-daemon.socket; then
@@ -231,15 +243,13 @@ jobs:
  - name: Repeated install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  init: none
- planner: linux
- extra-args: ${{ matrix.extra-args }}
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
+ logger: pretty
+ planner: linux
  - name: echo $PATH
  run: echo $PATH
  - name: Test `nix` with `$GITHUB_PATH`
@@ -294,7 +304,7 @@ jobs:
  needs: [lints, build-x86_64-darwin]
  strategy:
  matrix:
- extra-args: ["--determinate", ""]
+ determinate: [true, false]
  permissions:
  id-token: "write"
  contents: "read"
@@ -315,15 +325,20 @@ jobs:
  - name: Initial install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
- extra-args: ${{ matrix.extra-args }}
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
- extra-conf: |
- trusted-users = root runner
+ logger: pretty
+ - name: "Validate dnixd is ${{ matrix.determinate && 'installed' || 'uninstalled' }}"
+ run: |
+ if test -x /usr/local/bin/determinate-nixd; then
+ echo "determinate-nixd is present"
+ ${{ matrix.determinate }}
+ else
+ echo "determinate-nixd is not present"
+ ${{ !matrix.determinate }}
+ fi
  - name: Initial uninstall (without a `nix run` first)
  run: sudo -E /nix/nix-installer uninstall
  env:
@@ -334,14 +349,11 @@ jobs:
  - name: Repeated install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
- extra-args: ${{ matrix.extra-args }}
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
- extra-conf: trusted-users = root runner
+ logger: pretty
  - name: echo $PATH
  run: echo $PATH
  - name: Test `nix` with `$GITHUB_PATH`
@@ -382,7 +394,7 @@ jobs:
  needs: [lints, build-aarch64-linux]
  strategy:
  matrix:
- extra-args: ["--determinate", ""]
+ determinate: [true, false]
  permissions:
  id-token: "write"
  contents: "read"
@@ -403,13 +415,20 @@ jobs:
  - name: Initial install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- extra-args: ${{ matrix.extra-args }}
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
+ logger: pretty
+ - name: "Validate dnixd is ${{ matrix.determinate && 'installed' || 'uninstalled' }}"
+ run: |
+ if test -x /usr/local/bin/determinate-nixd; then
+ echo "determinate-nixd is present"
+ ${{ matrix.determinate }}
+ else
+ echo "determinate-nixd is not present"
+ ${{ !matrix.determinate }}
+ fi
  - name: Initial uninstall (without a `nix run` first)
  run: sudo -E /nix/nix-installer uninstall
  env:
@@ -434,13 +453,11 @@ jobs:
  - name: Repeated install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- logger: pretty
- extra-args: ${{ matrix.extra-args }}
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
+ logger: pretty
  - name: echo $PATH
  run: echo $PATH
  - name: Test `nix` with `$GITHUB_PATH`
@@ -495,7 +512,7 @@ jobs:
  needs: [lints, build-aarch64-darwin]
  strategy:
  matrix:
- extra-args: ["--determinate", ""]
+ determinate: [true, false]
  permissions:
  id-token: "write"
  contents: "read"
@@ -516,15 +533,20 @@ jobs:
  - name: Initial install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- extra-args: ${{ matrix.extra-args }}
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
- extra-conf: |
- trusted-users = root runner
+ logger: pretty
+ - name: "Validate dnixd is ${{ matrix.determinate && 'installed' || 'uninstalled' }}"
+ run: |
+ if test -x /usr/local/bin/determinate-nixd; then
+ echo "determinate-nixd is present"
+ ${{ matrix.determinate }}
+ else
+ echo "determinate-nixd is not present"
+ ${{ !matrix.determinate }}
+ fi
  - name: Initial uninstall (without a `nix run` first)
  run: sudo -E /nix/nix-installer uninstall
  env:
@@ -535,14 +557,11 @@ jobs:
  - name: Repeated install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: ${{ matrix.determinate }}
  local-root: install-root/
- extra-args: ${{ matrix.extra-args }}
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
- github-token: ${{ secrets.GITHUB_TOKEN }}
- extra-conf: trusted-users = root runner
+ logger: pretty
  - name: echo $PATH
  run: echo $PATH
  - name: Test `nix` with `$GITHUB_PATH`
@@ -603,11 +622,11 @@ jobs:
  - name: Initial install
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ backtrace: full
+ determinate: true
  local-root: install-root/
- logger: pretty
  log-directives: nix_installer=debug
- backtrace: full
+ logger: pretty
  - uses: DeterminateSystems/magic-nix-cache-action@main
  with:
  use-gha-cache: false

.github/workflows/update.yml

@@ -16,7 +16,7 @@ jobs:
  - name: Install Nix
  uses: DeterminateSystems/nix-installer-action@main
  with:
- flakehub: true
+ determinate: true
  - name: Enable Magic Nix Cache
  uses: DeterminateSystems/magic-nix-cache-action@main
  with: