Compare commits
	
		
			8 Commits
		
	
	
		
			v14
			...
			enable-exp
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 53fb0300a7 | ||
|  | 825ca3e533 | ||
|  | fe464fe88d | ||
|  | 896dc80fef | ||
|  | 3e0e991ad2 | ||
|  | d04e8d60ba | ||
|  | 791347c66b | ||
|  | 3e073d0e89 | 
							
								
								
									
										27
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										27
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -12,7 +12,7 @@ jobs: | |||||||
|         os: [ubuntu-latest, macos-latest] |         os: [ubuntu-latest, macos-latest] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2.3.4 |     - uses: actions/checkout@v2.3.5 | ||||||
|     - run: yarn install --frozen-lockfile |     - run: yarn install --frozen-lockfile | ||||||
|     - run: yarn build |     - run: yarn build | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
| @@ -31,7 +31,7 @@ jobs: | |||||||
|         os: [ubuntu-latest, macos-latest] |         os: [ubuntu-latest, macos-latest] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2.3.4 |     - uses: actions/checkout@v2.3.5 | ||||||
|     - run: yarn install --frozen-lockfile |     - run: yarn install --frozen-lockfile | ||||||
|     - run: yarn build |     - run: yarn build | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
| @@ -47,7 +47,7 @@ jobs: | |||||||
|         os: [ubuntu-latest, macos-latest] |         os: [ubuntu-latest, macos-latest] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2.3.4 |     - uses: actions/checkout@v2.3.5 | ||||||
|     - run: yarn install --frozen-lockfile |     - run: yarn install --frozen-lockfile | ||||||
|     - run: yarn build |     - run: yarn build | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
| @@ -65,7 +65,7 @@ jobs: | |||||||
|         os: [ubuntu-latest, macos-latest] |         os: [ubuntu-latest, macos-latest] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2.3.4 |     - uses: actions/checkout@v2.3.5 | ||||||
|     - run: yarn install --frozen-lockfile |     - run: yarn install --frozen-lockfile | ||||||
|     - run: yarn build |     - run: yarn build | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
| @@ -74,7 +74,6 @@ jobs: | |||||||
|         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install |         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' | ||||||
|         extra_nix_config: | |         extra_nix_config: | | ||||||
|           experimental-features = nix-command flakes |  | ||||||
|           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} |           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||||||
|     - run: nix flake show github:NixOS/nixpkgs |     - run: nix flake show github:NixOS/nixpkgs | ||||||
|  |  | ||||||
| @@ -84,7 +83,7 @@ jobs: | |||||||
|         os: [ubuntu-latest, macos-latest] |         os: [ubuntu-latest, macos-latest] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2 |     - uses: actions/checkout@v2.3.5 | ||||||
|     - run: yarn install --frozen-lockfile |     - run: yarn install --frozen-lockfile | ||||||
|     - run: yarn build |     - run: yarn build | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
| @@ -94,3 +93,19 @@ jobs: | |||||||
|         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install |         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' | ||||||
|     - run: nix-build test.nix |     - run: nix-build test.nix | ||||||
|  |  | ||||||
|  |   oldest-supported-installer: | ||||||
|  |     strategy: | ||||||
|  |         matrix: | ||||||
|  |           os: [ubuntu-latest, macos-latest] | ||||||
|  |     runs-on: ${{ matrix.os }} | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v2.3.5 | ||||||
|  |     - run: yarn install --frozen-lockfile | ||||||
|  |     - run: yarn build | ||||||
|  |     - name: Install Nix | ||||||
|  |       uses: ./ | ||||||
|  |       with: | ||||||
|  |         nix_path: nixpkgs=channel:nixos-21.05 | ||||||
|  |         install_url: https://releases.nixos.org/nix/nix-2.3.5/install | ||||||
|  |     - run: nix-build test.nix | ||||||
|   | |||||||
| @@ -14,10 +14,11 @@ 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` | - 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 configration 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`)  | ||||||
|  |  | ||||||
| ## Usage | ## Usage | ||||||
|  |  | ||||||
| @@ -52,12 +53,11 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2.3.4 |     - uses: actions/checkout@v2.3.4 | ||||||
|     - uses: cachix/install-nix-action@v13 |     - uses: cachix/install-nix-action@v14 | ||||||
|       with: |       with: | ||||||
|         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install |         install_url: https://nixos-nix-install-tests.cachix.org/serve/vij683ly7sl95nnhb67bdjjfabclr85m/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' | ||||||
|         extra_nix_config: | |         extra_nix_config: | | ||||||
|           experimental-features = nix-command flakes |  | ||||||
|           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} |           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||||||
|     - run: nix build |     - run: nix build | ||||||
|     - run: nix flake check |     - run: nix flake check | ||||||
|   | |||||||
| @@ -18,6 +18,9 @@ add_config "trusted-users = root $USER" | |||||||
| if [[ $INPUT_EXTRA_NIX_CONFIG != "" ]]; then | if [[ $INPUT_EXTRA_NIX_CONFIG != "" ]]; then | ||||||
|   add_config "$INPUT_EXTRA_NIX_CONFIG" |   add_config "$INPUT_EXTRA_NIX_CONFIG" | ||||||
| fi | fi | ||||||
|  | if [[ ! $INPUT_EXTRA_NIX_CONFIG =~ "experimental-features" ]]; then   | ||||||
|  |   add_config "experimental-features = nix-command flakes" | ||||||
|  | fi | ||||||
|  |  | ||||||
| # Nix installer flags | # Nix installer flags | ||||||
| installer_options=( | installer_options=( | ||||||
| @@ -48,9 +51,6 @@ echo "installer options: ${installer_options[@]}" | |||||||
| sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") "${installer_options[@]}" | sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") "${installer_options[@]}" | ||||||
|  |  | ||||||
| if [[ $OSTYPE =~ darwin ]]; then | if [[ $OSTYPE =~ darwin ]]; then | ||||||
|   # Disable spotlight indexing of /nix to speed up performance |  | ||||||
|   sudo mdutil -i off /nix |  | ||||||
|  |  | ||||||
|   # macOS needs certificates hints |   # macOS needs certificates hints | ||||||
|   cert_file=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt |   cert_file=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt | ||||||
|   echo "NIX_SSL_CERT_FILE=$cert_file" >> "$GITHUB_ENV" |   echo "NIX_SSL_CERT_FILE=$cert_file" >> "$GITHUB_ENV" | ||||||
|   | |||||||
| @@ -3307,9 +3307,9 @@ throat@^4.0.0: | |||||||
|   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= |   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= | ||||||
|  |  | ||||||
| tmpl@1.0.x: | tmpl@1.0.x: | ||||||
|   version "1.0.4" |   version "1.0.5" | ||||||
|   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" |   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" | ||||||
|   integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= |   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== | ||||||
|  |  | ||||||
| to-fast-properties@^2.0.0: | to-fast-properties@^2.0.0: | ||||||
|   version "2.0.0" |   version "2.0.0" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user