Compare commits

...

8 commits

Author SHA1 Message Date
Ana Hobden c67dd30e67 Is it fixed on main 2023-06-27 09:48:49 -07:00
Ana Hobden 0897b85290 Missed a rename in the if statement 2023-06-27 09:39:09 -07:00
Ana Hobden cc23aa2fec Remove unnecessary quotes 2023-06-27 09:37:51 -07:00
Ana Hobden 56ecdbd741 Whoops did not save 2023-06-27 09:36:19 -07:00
Ana Hobden e7cc0afd1d Try writing to file 2023-06-27 09:33:06 -07:00
Ana Hobden 317936b794 Does it work with block chomping 2023-06-27 09:10:37 -07:00
Ana Hobden 710f8bd079 Test simpler yaml string 2023-06-27 08:54:28 -07:00
Ana Hobden 1928ffb7dd Add extra-conf test 2023-06-27 08:31:35 -07:00
2 changed files with 11 additions and 8 deletions

View file

@ -17,6 +17,10 @@ jobs:
logger: pretty
log-directives: nix_installer=trace
backtrace: full
nix-installer-branch: main
extra-conf: |
experimental-features = impure-derivations
- run: cat /etc/nix/nix.conf
- name: echo $PATH
run: echo $PATH
- name: Test `nix` with `$GITHUB_PATH`

View file

@ -159,20 +159,19 @@ runs:
echo "Set NIX_INSTALLER_NIX_PACKAGE_URL=$NIX_INSTALLER_NIX_PACKAGE_URL"
fi
NIX_EXTRA_CONF=""
NEWLINE='
'
NIX_EXTRA_CONF_FILE=$(mktemp --suffix=nix-installer-extra-conf)
if [ -n "${{ inputs.extra-conf }}" ]; then
NIX_EXTRA_CONF="${{ inputs.extra-conf }}"
echo "${{ inputs.extra-conf }}" >> ${NIX_EXTRA_CONF_FILE}
fi
if [ -n "${{ inputs.github-token }}" ]; then
NIX_EXTRA_CONF="${NIX_EXTRA_CONF:+$NIX_EXTRA_CONF$NEWLINE}access-tokens = github.com=${{ inputs.github-token }}"
echo "access-tokens = github.com=${{ inputs.github-token }}" >> ${NIX_EXTRA_CONF_FILE}
fi
if [ "${{ inputs.trust-runner-user }}" == "true" ]; then
NIX_EXTRA_CONF="${NIX_EXTRA_CONF:+$NIX_EXTRA_CONF$NEWLINE}trusted-users = root $USER"
echo "trusted-users = root $USER" >> ${NIX_EXTRA_CONF_FILE}
fi
if [ -n "$NIX_EXTRA_CONF" ]; then
export NIX_INSTALLER_EXTRA_CONF="$NIX_EXTRA_CONF"
if [ -n "$NIX_EXTRA_CONF_FILE" ]; then
export NIX_INSTALLER_EXTRA_CONF=$(cat ${NIX_EXTRA_CONF_FILE})
echo "Set NIX_INSTALLER_EXTRA_CONF=$NIX_INSTALLER_EXTRA_CONF"
fi