Compare commits
	
		
			4 Commits
		
	
	
		
			auto-uid-a
			...
			macos-13
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | bbca90b740 | ||
|  | e27879448e | ||
|  | 8ab3881720 | ||
|  | 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 | ||||||
							
								
								
									
										2
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -9,7 +9,7 @@ jobs: | |||||||
|   simple-build: |   simple-build: | ||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         os: [ubuntu-latest, macos-latest] |         os: [ubuntu-latest, macos-latest, macos-13] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v3 |     - uses: actions/checkout@v3 | ||||||
|   | |||||||
| @@ -19,6 +19,9 @@ add_config() { | |||||||
| } | } | ||||||
| # Set jobs to number of cores | # Set jobs to number of cores | ||||||
| add_config "max-jobs = auto" | add_config "max-jobs = auto" | ||||||
|  | if [[ $OSTYPE =~ darwin ]]; then | ||||||
|  |   add_config "ssl-cert-file = /etc/ssl/cert.pem" | ||||||
|  | fi | ||||||
| # 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 | ||||||
| @@ -32,7 +35,7 @@ if [[ -n "${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 | 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 | fi | ||||||
|  |  | ||||||
| # Nix installer flags | # Nix installer flags | ||||||
| @@ -46,9 +49,8 @@ installer_options=( | |||||||
| if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then | if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then | ||||||
|   installer_options+=( |   installer_options+=( | ||||||
|     --daemon |     --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 | else | ||||||
|   # "fix" the following error when running nix* |   # "fix" the following error when running nix* | ||||||
|   # error: the group 'nixbld' specified in 'build-users-group' does not exist |   # error: the group 'nixbld' specified in 'build-users-group' does not exist | ||||||
| @@ -67,7 +69,7 @@ echo "installer options: ${installer_options[*]}" | |||||||
|  |  | ||||||
| # There is --retry-on-errors, but only newer curl versions support that | # There is --retry-on-errors, but only newer curl versions support that | ||||||
| curl_retries=5 | 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.16.1/install}" | ||||||
| do | do | ||||||
|   sleep 1 |   sleep 1 | ||||||
|   ((curl_retries--)) |   ((curl_retries--)) | ||||||
| @@ -79,14 +81,6 @@ done | |||||||
|  |  | ||||||
| sh "$workdir/install" "${installer_options[@]}" | 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 | # 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 | # new path for nix 2.14 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user