Compare commits
	
		
			13 Commits
		
	
	
		
			auto-uid-a
			...
			fix/196
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 97a1be3c09 | ||
|  | 300721fe01 | ||
|  | fe6788c5de | ||
|  | 6a9a9e84a1 | ||
|  | 4509d84f10 | ||
|  | 5cfd5166ea | ||
|  | e02ea8c42e | ||
|  | fffc90f426 | ||
|  | 6ed004b9cc | ||
|  | e27879448e | ||
|  | 8ab3881720 | ||
|  | 16b951426e | ||
|  | 2c203fd87b | 
							
								
								
									
										15
									
								
								.editorconfig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								.editorconfig
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| # EditorConfig is awesome: https://EditorConfig.org | ||||
|  | ||||
| # top-most EditorConfig file | ||||
| root = true | ||||
|  | ||||
| # Unix-style newlines with a newline ending every file | ||||
| [*] | ||||
| charset = utf-8 | ||||
| end_of_line = lf | ||||
| indent_size = 2 | ||||
| indent_style = space | ||||
| insert_final_newline = true | ||||
|  | ||||
| [LICENSE] | ||||
| indent_size = unset | ||||
							
								
								
									
										14
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -12,7 +12,7 @@ jobs: | ||||
|         os: [ubuntu-latest, macos-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - name: Install Nix | ||||
|       uses: ./ | ||||
|       with: | ||||
| @@ -28,7 +28,7 @@ jobs: | ||||
|         os: [ubuntu-latest, macos-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - name: Install Nix | ||||
|       uses: ./ | ||||
|       with: | ||||
| @@ -42,7 +42,7 @@ jobs: | ||||
|         os: [ubuntu-latest, macos-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - name: Install Nix | ||||
|       uses: ./ | ||||
|       with: | ||||
| @@ -58,7 +58,7 @@ jobs: | ||||
|         os: [ubuntu-latest, macos-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - name: Install Nix | ||||
|       uses: ./ | ||||
|     - run: nix flake show github:NixOS/nixpkgs | ||||
| @@ -69,7 +69,7 @@ jobs: | ||||
|         os: [ubuntu-latest, macos-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - name: Install Nix | ||||
|       uses: ./ | ||||
|       with: | ||||
| @@ -84,7 +84,7 @@ jobs: | ||||
|           os: [ubuntu-latest, macos-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - name: Install Nix | ||||
|       uses: ./ | ||||
|       with: | ||||
| @@ -98,7 +98,7 @@ jobs: | ||||
|           os: [ubuntu-latest] | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: actions/checkout@v4 | ||||
|     - run: curl https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash | ||||
|     - run: docker pull ghcr.io/catthehacker/ubuntu:js-20.04 | ||||
|     - run: ./bin/act -P ubuntu-latest=ghcr.io/catthehacker/ubuntu:js-20.04 push -j simple-build | ||||
|   | ||||
							
								
								
									
										10
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								README.md
									
									
									
									
									
								
							| @@ -6,8 +6,8 @@ Installs [Nix](https://nixos.org/nix/) on GitHub Actions for the supported platf | ||||
|  | ||||
| By default it has no nixpkgs configured, you have to set `nix_path` | ||||
| by [picking a channel](https://status.nixos.org/) | ||||
| or [pin nixpkgs yourself](https://nix.dev/reference/pinning-nixpkgs.html) | ||||
| (see also [pinning tutorial](https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html)). | ||||
| or [pin nixpkgs yourself](https://nix.dev/reference/pinning-nixpkgs) | ||||
| (see also [pinning tutorial](https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs)). | ||||
|  | ||||
| # Features | ||||
|  | ||||
| @@ -34,7 +34,7 @@ jobs: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: cachix/install-nix-action@v20 | ||||
|     - uses: cachix/install-nix-action@v22 | ||||
|       with: | ||||
|         nix_path: nixpkgs=channel:nixos-unstable | ||||
|     - run: nix-build | ||||
| @@ -52,7 +52,7 @@ jobs: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|     - uses: actions/checkout@v3 | ||||
|     - uses: cachix/install-nix-action@v20 | ||||
|     - uses: cachix/install-nix-action@v22 | ||||
|       with: | ||||
|         github_access_token: ${{ secrets.GITHUB_TOKEN }} | ||||
|     - run: nix build | ||||
| @@ -120,7 +120,7 @@ Otherwise, you can add any binary cache to nix.conf using | ||||
| install-nix-action's own `extra_nix_config` input: | ||||
|  | ||||
| ```yaml | ||||
| - uses: cachix/install-nix-action@v20 | ||||
| - uses: cachix/install-nix-action@v22 | ||||
|   with: | ||||
|     extra_nix_config: | | ||||
|       trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= | ||||
|   | ||||
| @@ -17,22 +17,33 @@ trap 'rm -rf "$workdir"' EXIT | ||||
| add_config() { | ||||
|   echo "$1" >> "$workdir/nix.conf" | ||||
| } | ||||
| add_config "show-trace = true" | ||||
| # Set jobs to number of cores | ||||
| add_config "max-jobs = auto" | ||||
| if [[ $OSTYPE =~ darwin ]]; then | ||||
|   add_config "ssl-cert-file = /etc/ssl/cert.pem" | ||||
| fi | ||||
| # Allow binary caches for user | ||||
| add_config "trusted-users = root ${USER:-}" | ||||
| # Add github access token | ||||
| # Add a GitHub access token. | ||||
| # Token-less access is subject to lower rate limits. | ||||
| if [[ -n "${INPUT_GITHUB_ACCESS_TOKEN:-}" ]]; then | ||||
|   echo "::debug::Using the provided github_access_token for github.com" | ||||
|   add_config "access-tokens = github.com=$INPUT_GITHUB_ACCESS_TOKEN" | ||||
| elif [[ -n "${GITHUB_TOKEN:-}" ]]; then | ||||
| # Use the default GitHub token if available. | ||||
| # Skip this step if running an Enterprise instance. The default token there does not work for github.com. | ||||
| elif [[ -n "${GITHUB_TOKEN:-}" && $GITHUB_SERVER_URL == "https://github.com" ]]; then | ||||
|   echo "::debug::Using the default GITHUB_TOKEN for github.com" | ||||
|   add_config "access-tokens = github.com=$GITHUB_TOKEN" | ||||
| else | ||||
|   echo "::debug::Continuing without a GitHub access token" | ||||
| fi | ||||
| # Append extra nix configuration if provided | ||||
| if [[ -n "${INPUT_EXTRA_NIX_CONFIG:-}" ]]; then | ||||
|   add_config "$INPUT_EXTRA_NIX_CONFIG" | ||||
| fi | ||||
| if [[ ! $INPUT_EXTRA_NIX_CONFIG =~ "experimental-features" ]]; then | ||||
|   add_config "experimental-features = nix-command flakes auto-allocate-uids" | ||||
|   add_config "experimental-features = nix-command flakes" | ||||
| fi | ||||
|  | ||||
| # Nix installer flags | ||||
| @@ -46,9 +57,8 @@ installer_options=( | ||||
| if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then | ||||
|   installer_options+=( | ||||
|     --daemon | ||||
|     --daemon-user-count 1 | ||||
|     --daemon-user-count "$(python3 -c 'import multiprocessing as mp; print(mp.cpu_count() * 2)')" | ||||
|   ) | ||||
|   add_config "auto-allocate-uids = true" | ||||
| else | ||||
|   # "fix" the following error when running nix* | ||||
|   # error: the group 'nixbld' specified in 'build-users-group' does not exist | ||||
| @@ -67,7 +77,7 @@ echo "installer options: ${installer_options[*]}" | ||||
|  | ||||
| # There is --retry-on-errors, but only newer curl versions support that | ||||
| curl_retries=5 | ||||
| while ! curl -sS -o "$workdir/install" -v --fail -L "${INPUT_INSTALL_URL:-https://releases.nixos.org/nix/nix-2.15.1/install}" | ||||
| while ! curl -sS -o "$workdir/install" -v --fail -L "${INPUT_INSTALL_URL:-https://releases.nixos.org/nix/nix-2.17.0/install}" | ||||
| do | ||||
|   sleep 1 | ||||
|   ((curl_retries--)) | ||||
| @@ -79,14 +89,6 @@ done | ||||
|  | ||||
| sh "$workdir/install" "${installer_options[@]}" | ||||
|  | ||||
| if [[ $OSTYPE =~ darwin ]]; then | ||||
|   # macOS needs certificates hints | ||||
|   cert_file=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt | ||||
|   echo "NIX_SSL_CERT_FILE=$cert_file" >> "$GITHUB_ENV" | ||||
|   export NIX_SSL_CERT_FILE=$cert_file | ||||
|   sudo launchctl setenv NIX_SSL_CERT_FILE "$cert_file" | ||||
| fi | ||||
|  | ||||
| # Set paths | ||||
| echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH" | ||||
| # new path for nix 2.14 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user