Compare commits

...

10 Commits
v2 ... v4

Author SHA1 Message Date
Ana Hobden 65d7c888b2 Merge pull request #26 from DeterminateSystems/different-url-for-ci
Add a ?ci=github to GHA requests
2023-06-05 10:53:09 -07:00
Ana Hobden 322d409404 Add quotes 2023-06-01 11:32:35 -07:00
Ana Hobden 11e71cc767 Add a ?ci=github to GHA requests 2023-05-31 13:44:05 -07:00
Ana Hobden 8c00b3afd2 Merge pull request #25 from ajaxbits/patch-1
Update example in README to use v3
2023-05-30 09:50:55 -07:00
Alex Jackson 9c5d3b3cb7 Update README.md with latest v3 version
Updates readme to reflect latest `v3` release of the action.
2023-05-30 10:28:21 -05:00
Ana Hobden 129f079024 Merge pull request #22 from DeterminateSystems/v0.9.0-changes
v0.9.0 - nix profile location change
2023-05-25 09:57:30 -07:00
Ana Hobden 23314a8041 Merge branch 'use-not-fortune' into v0.9.0-changes 2023-05-25 09:32:35 -07:00
Ana Hobden cd77c17f59 Maybe we can use hello 2023-05-25 08:54:25 -07:00
Ana Hobden 10f7447de7 Use ripgrep instead of fortune 2023-05-25 08:53:32 -07:00
Ana Hobden e46eb0b82c v0.9.0 - nix profile location change 2023-05-24 09:46:04 -07:00
3 changed files with 32 additions and 31 deletions
+24 -24
View File
@@ -22,11 +22,11 @@ jobs:
- name: Test `nix` with `$GITHUB_PATH`
if: success() || failure()
run: |
nix run nixpkgs#fortune
nix profile install nixpkgs#fortune
fortune
nix run nixpkgs#hello
nix profile install nixpkgs#hello
hello
nix store gc
nix run nixpkgs#fortune
nix run nixpkgs#hello
- name: Test bash
run: nix-instantiate -E 'builtins.currentTime' --eval
if: success() || failure()
@@ -44,11 +44,11 @@ jobs:
- name: Test `nix` with `$GITHUB_PATH`
if: success() || failure()
run: |
nix run nixpkgs#fortune
nix profile install nixpkgs#fortune
fortune
nix run nixpkgs#hello
nix profile install nixpkgs#hello
hello
nix store gc
nix run nixpkgs#fortune
nix run nixpkgs#hello
- name: Reinstall Nix
uses: ./
with:
@@ -61,11 +61,11 @@ jobs:
- name: Test `nix` with `$GITHUB_PATH`
if: success() || failure()
run: |
nix run nixpkgs#fortune
nix profile install nixpkgs#fortune
fortune
nix run nixpkgs#hello
nix profile install nixpkgs#hello
hello
nix store gc
nix run nixpkgs#fortune
nix run nixpkgs#hello
- name: Verify the generated nix.conf
run: |
cat -n /etc/nix/nix.conf
@@ -88,11 +88,11 @@ jobs:
- name: Test `nix` with `$GITHUB_PATH`
if: success() || failure()
run: |
nix run nixpkgs#fortune
nix profile install nixpkgs#fortune
fortune
nix run nixpkgs#hello
nix profile install nixpkgs#hello
hello
nix store gc
nix run nixpkgs#fortune
nix run nixpkgs#hello
- name: Test bash
run: nix-instantiate -E 'builtins.currentTime' --eval
if: success() || failure()
@@ -114,11 +114,11 @@ jobs:
- name: Test `nix` with `$GITHUB_PATH`
if: success() || failure()
run: |
nix run nixpkgs#fortune
nix profile install nixpkgs#fortune
fortune
nix run nixpkgs#hello
nix profile install nixpkgs#hello
hello
nix store gc
nix run nixpkgs#fortune
nix run nixpkgs#hello
- name: Reinstall Nix
uses: ./
with:
@@ -131,11 +131,11 @@ jobs:
- name: Test `nix` with `$GITHUB_PATH`
if: success() || failure()
run: |
nix run nixpkgs#fortune
nix profile install nixpkgs#fortune
fortune
nix run nixpkgs#hello
nix profile install nixpkgs#hello
hello
nix store gc
nix run nixpkgs#fortune
nix run nixpkgs#hello
- name: Verify the generated nix.conf
run: |
cat -n /etc/nix/nix.conf
+1 -1
View File
@@ -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 .
```
+7 -6
View File
@@ -119,6 +119,7 @@ runs:
fi
echo "Nix was already installed, using existing install"
echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
exit 0
fi
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"