Compare commits
	
		
			9 Commits
		
	
	
		
			fix-nix-2.
			...
			update-rea
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | cb6121cc54 | ||
|  | 5c11eae19d | ||
|  | 846213dc1f | ||
|  | bd6084e16e | ||
|  | 67388ca69e | ||
|  | a4b8aaf5a2 | ||
|  | 70980f045d | ||
|  | 25d64bbf11 | ||
|  | b95f682503 | 
							
								
								
									
										15
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -61,11 +61,6 @@ jobs: | |||||||
|     - uses: actions/checkout@v3 |     - uses: actions/checkout@v3 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |  | ||||||
|         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install |  | ||||||
|         install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve' |  | ||||||
|         extra_nix_config: | |  | ||||||
|           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} |  | ||||||
|     - run: nix flake show github:NixOS/nixpkgs |     - run: nix flake show github:NixOS/nixpkgs | ||||||
|  |  | ||||||
|   installer-options: |   installer-options: | ||||||
| @@ -78,9 +73,9 @@ jobs: | |||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-21.05 |         nix_path: nixpkgs=channel:nixos-22.05 | ||||||
|         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install |         install_options: --tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve | ||||||
|         install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve' |         install_url: https://nixos-nix-install-tests.cachix.org/serve/s62m7lc0q0mz2mxxm9q0kkrcg90njzhq/install | ||||||
|     - run: nix-build test.nix |     - run: nix-build test.nix | ||||||
|  |  | ||||||
|   oldest-supported-installer: |   oldest-supported-installer: | ||||||
| @@ -93,8 +88,8 @@ jobs: | |||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-21.05 |         nix_path: nixpkgs=channel:nixos-22.05 | ||||||
|         install_url: https://releases.nixos.org/nix/nix-2.3.8/install |         install_url: https://releases.nixos.org/nix/nix-2.8.0/install | ||||||
|     - run: nix-build test.nix |     - run: nix-build test.nix | ||||||
|  |  | ||||||
|   act-support: |   act-support: | ||||||
|   | |||||||
							
								
								
									
										39
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										39
									
								
								README.md
									
									
									
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| # install-nix-action | # install-nix-action | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| Installs [Nix](https://nixos.org/nix/) on GitHub Actions for the supported platforms: Linux and macOS. | Installs [Nix](https://nixos.org/nix/) on GitHub Actions for the supported platforms: Linux and macOS. | ||||||
|  |  | ||||||
| @@ -13,12 +13,12 @@ or [pin nixpkgs yourself](https://nix.dev/reference/pinning-nixpkgs.html) | |||||||
|  |  | ||||||
| - Quick installation (~4s on Linux, ~20s on macOS) | - Quick installation (~4s on Linux, ~20s on macOS) | ||||||
| - Multi-User installation (with sandboxing enabled only on Linux) | - Multi-User installation (with sandboxing enabled only on Linux) | ||||||
| - [Self-hosted github runner](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners) support | - [Self-hosted GitHub runner](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners) support | ||||||
| - Allows specifying Nix installation URL via `install_url` (the oldest supported Nix version is 2.3.5) | - Allows specifying Nix installation URL via `install_url` (the oldest supported Nix version is 2.3.5) | ||||||
| - Allows specifying extra Nix configration options via `extra_nix_config` | - Allows specifying extra Nix configuration options via `extra_nix_config` | ||||||
| - Allows specifying `$NIX_PATH` and channels via `nix_path` | - Allows specifying `$NIX_PATH` and channels via `nix_path` | ||||||
| - Share `/nix/store` between builds using [cachix-action](https://github.com/cachix/cachix-action) for simple binary cache setup to speed up your builds and share binaries with your team | - Share `/nix/store` between builds using [cachix-action](https://github.com/cachix/cachix-action) for simple binary cache setup to speed up your builds and share binaries with your team | ||||||
| - Enables `flakes` and `nix-command` experimental features by default (to disable, set ``experimental-features`` via ``extra_nix_config``)  | - Enables `flakes` and `nix-command` experimental features by default (to disable, set `experimental-features` via `extra_nix_config`) | ||||||
|  |  | ||||||
| ## Usage | ## Usage | ||||||
|  |  | ||||||
| @@ -34,13 +34,12 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v3 |     - uses: actions/checkout@v3 | ||||||
|     - uses: cachix/install-nix-action@v18 |     - uses: cachix/install-nix-action@v19 | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-unstable |         nix_path: nixpkgs=channel:nixos-unstable | ||||||
|     - run: nix-build |     - run: nix-build | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
|  |  | ||||||
| ## Usage with Flakes | ## Usage with Flakes | ||||||
|  |  | ||||||
| ```yaml | ```yaml | ||||||
| @@ -53,7 +52,7 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v3 |     - uses: actions/checkout@v3 | ||||||
|     - uses: cachix/install-nix-action@v18 |     - uses: cachix/install-nix-action@v19 | ||||||
|       with: |       with: | ||||||
|         github_access_token: ${{ secrets.GITHUB_TOKEN }} |         github_access_token: ${{ secrets.GITHUB_TOKEN }} | ||||||
|     - run: nix build |     - run: nix build | ||||||
| @@ -66,11 +65,11 @@ To install Nix from any commit, go to [the corresponding installer_test action]( | |||||||
|  |  | ||||||
| - `extra_nix_config`: append to `/etc/nix/nix.conf` | - `extra_nix_config`: append to `/etc/nix/nix.conf` | ||||||
|  |  | ||||||
| - `github_access_token`: configure nix to pull from github using the given github token. This helps work around rate limit issues. | - `github_access_token`: configure Nix to pull from GitHub using the given GitHub token. This helps work around rate limit issues. Has no effect when `access-tokens` is also specified in `extra_nix_config`. | ||||||
|  |  | ||||||
| - `install_url`: specify URL to install Nix from (useful for testing non-stable releases or pinning Nix for example https://releases.nixos.org/nix/nix-2.3.7/install) | - `install_url`: specify URL to install Nix from (useful for testing non-stable releases or pinning Nix, for example https://releases.nixos.org/nix/nix-2.3.7/install) | ||||||
|  |  | ||||||
| - `install_options`: Additional installer flags passed to the installer script. | - `install_options`: additional installer flags passed to the installer script. | ||||||
|  |  | ||||||
| - `nix_path`: set `NIX_PATH` environment variable, for example `nixpkgs=channel:nixos-unstable` | - `nix_path`: set `NIX_PATH` environment variable, for example `nixpkgs=channel:nixos-unstable` | ||||||
|  |  | ||||||
| @@ -80,7 +79,6 @@ To install Nix from any commit, go to [the corresponding installer_test action]( | |||||||
|  |  | ||||||
| ### How do I print nixpkgs version I have configured? | ### How do I print nixpkgs version I have configured? | ||||||
|  |  | ||||||
|  |  | ||||||
| ```yaml | ```yaml | ||||||
| - name: Print nixpkgs version | - name: Print nixpkgs version | ||||||
|   run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version' |   run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version' | ||||||
| @@ -122,26 +120,9 @@ Otherwise, you can add any binary cache to nix.conf using | |||||||
| install-nix-action's own `extra_nix_config` input: | install-nix-action's own `extra_nix_config` input: | ||||||
|  |  | ||||||
| ```yaml | ```yaml | ||||||
| - uses: cachix/install-nix-action@v18 | - uses: cachix/install-nix-action@v19 | ||||||
|   with: |   with: | ||||||
|     extra_nix_config: | |     extra_nix_config: | | ||||||
|       trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= |       trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= | ||||||
|       substituters = https://hydra.iohk.io https://cache.nixos.org/ |       substituters = https://hydra.iohk.io https://cache.nixos.org/ | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
| ## Hacking |  | ||||||
|  |  | ||||||
| Install the dependencies |  | ||||||
| ```bash |  | ||||||
| $ yarn install |  | ||||||
| ``` |  | ||||||
|  |  | ||||||
| Build the typescript |  | ||||||
| ```bash |  | ||||||
| $ yarn build |  | ||||||
| ``` |  | ||||||
|  |  | ||||||
| Run the tests :heavy_check_mark: |  | ||||||
| ```bash |  | ||||||
| $ yarn test |  | ||||||
| ``` |  | ||||||
|   | |||||||
| @@ -26,3 +26,4 @@ runs: | |||||||
|         INPUT_INSTALL_OPTIONS: ${{ inputs.install_options }} |         INPUT_INSTALL_OPTIONS: ${{ inputs.install_options }} | ||||||
|         INPUT_INSTALL_URL: ${{ inputs.install_url }} |         INPUT_INSTALL_URL: ${{ inputs.install_url }} | ||||||
|         INPUT_NIX_PATH: ${{ inputs.nix_path }} |         INPUT_NIX_PATH: ${{ inputs.nix_path }} | ||||||
|  |         GITHUB_TOKEN: ${{ github.token }} | ||||||
|   | |||||||
| @@ -20,10 +20,12 @@ add_config() { | |||||||
| # Set jobs to number of cores | # Set jobs to number of cores | ||||||
| add_config "max-jobs = auto" | add_config "max-jobs = auto" | ||||||
| # Allow binary caches for user | # Allow binary caches for user | ||||||
| add_config "trusted-users = root ${USER:-}" | add_config "trusted-users = root $USER" | ||||||
| # Add github access token | # Add github access token | ||||||
| if [[ $INPUT_GITHUB_ACCESS_TOKEN != "" ]]; then | if [[ -n "${INPUT_GITHUB_ACCESS_TOKEN:-}" ]]; then | ||||||
|   add_config "access-tokens" "github.com=$INPUT_GITHUB_ACCESS_TOKEN" |   add_config "access-tokens = github.com=$INPUT_GITHUB_ACCESS_TOKEN" | ||||||
|  | elif [[ -n "${GITHUB_TOKEN:-}" ]]; then | ||||||
|  |   add_config "access-tokens = github.com=$GITHUB_TOKEN" | ||||||
| fi | fi | ||||||
| # Append extra nix configuration if provided | # Append extra nix configuration if provided | ||||||
| if [[ $INPUT_EXTRA_NIX_CONFIG != "" ]]; then | if [[ $INPUT_EXTRA_NIX_CONFIG != "" ]]; then | ||||||
| @@ -86,8 +88,7 @@ fi | |||||||
|  |  | ||||||
| # Set paths | # Set paths | ||||||
| echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH" | echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH" | ||||||
| # new path for nix 2.14 | echo "/nix/var/nix/profiles/per-user/$USER/profile/bin" >> "$GITHUB_PATH" | ||||||
| echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH" |  | ||||||
|  |  | ||||||
| if [[ $INPUT_NIX_PATH != "" ]]; then | if [[ $INPUT_NIX_PATH != "" ]]; then | ||||||
|   echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV" |   echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user