Merge pull request #26 from DeterminateSystems/different-url-for-ci

Add a ?ci=github to GHA requests

.github/workflows/ci.yml

@@ -17,10 +17,6 @@ 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`

README.md

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v2
+        uses: DeterminateSystems/nix-installer-action@v3
       - name: Run `nix build`
         run: nix build .
 ```

action.yml

@@ -159,19 +159,20 @@ runs:
           echo "Set NIX_INSTALLER_NIX_PACKAGE_URL=$NIX_INSTALLER_NIX_PACKAGE_URL"
         fi
 
-        NIX_EXTRA_CONF_FILE=$(mktemp --suffix=nix-installer-extra-conf)
-
+        NIX_EXTRA_CONF=""
+        NEWLINE='
+        '
         if [ -n "${{ inputs.extra-conf }}" ]; then
-          echo "${{ inputs.extra-conf }}" >> ${NIX_EXTRA_CONF_FILE}
+          NIX_EXTRA_CONF="${{ inputs.extra-conf }}"
         fi
         if [ -n "${{ inputs.github-token }}" ]; then
-          echo "access-tokens = github.com=${{ inputs.github-token }}" >> ${NIX_EXTRA_CONF_FILE}
+          NIX_EXTRA_CONF="${NIX_EXTRA_CONF:+$NIX_EXTRA_CONF$NEWLINE}access-tokens = github.com=${{ inputs.github-token }}"
         fi
         if [ "${{ inputs.trust-runner-user }}" == "true" ]; then
-          echo "trusted-users = root $USER" >> ${NIX_EXTRA_CONF_FILE}
+          NIX_EXTRA_CONF="${NIX_EXTRA_CONF:+$NIX_EXTRA_CONF$NEWLINE}trusted-users = root $USER"
         fi
-        if [ -n "$NIX_EXTRA_CONF_FILE" ]; then
-          export NIX_INSTALLER_EXTRA_CONF=$(cat ${NIX_EXTRA_CONF_FILE})
+        if [ -n "$NIX_EXTRA_CONF" ]; then
+          export NIX_INSTALLER_EXTRA_CONF="$NIX_EXTRA_CONF"
           echo "Set NIX_INSTALLER_EXTRA_CONF=$NIX_INSTALLER_EXTRA_CONF"
         fi
 
@@ -254,18 +255,18 @@ runs:
           echo "Set NIX_INSTALLER_FORCE_ALLOW_HTTP=$NIX_INSTALLER_FORCE_ALLOW_HTTP"
         else
           if [ -n "${{ inputs.nix-installer-url }}" ]; then
-            export NIX_INSTALLER_URL=${{ inputs.nix-installer-url }}
+            export NIX_INSTALLER_URL="${{ inputs.nix-installer-url }}"
           else
             if [ -n "${{ inputs.nix-installer-pr }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/pr/${{ inputs.nix-installer-pr }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/pr/${{ inputs.nix-installer-pr }}?ci=github"
             elif [ -n "${{ inputs.nix-installer-tag }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/tag/${{ inputs.nix-installer-tag }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/tag/${{ inputs.nix-installer-tag }}?ci=github"
             elif [ -n "${{ inputs.nix-installer-revision }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/rev/${{ inputs.nix-installer-revision }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/rev/${{ inputs.nix-installer-revision }}?ci=github"
             elif [ -n "${{ inputs.nix-installer-branch }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/branch/${{ inputs.nix-installer-branch }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/branch/${{ inputs.nix-installer-branch }}?ci=github"
             else
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix?ci=github"
             fi
           fi
           echo "Set NIX_INSTALLER_URL=$NIX_INSTALLER_URL"