Compare commits
	
		
			9 Commits
		
	
	
		
			docs/149
			...
			macos-bump
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | e27879448e | ||
|  | 8ab3881720 | ||
|  | 2c203fd87b | ||
|  | 4b933aa7eb | ||
|  | 35806937f1 | ||
|  | 3eb7a24508 | ||
|  | b2f4229533 | ||
|  | e304541747 | ||
|  | 3988b729f9 | 
							
								
								
									
										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 | ||||||
							
								
								
									
										8
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -16,7 +16,7 @@ jobs: | |||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-20.03 |         nix_path: nixpkgs=channel:nixos-22.11 | ||||||
|     - run: nix-env -iA cachix -f https://cachix.org/api/v1/install |     - run: nix-env -iA cachix -f https://cachix.org/api/v1/install | ||||||
|     - run: cat /etc/nix/nix.conf |     - run: cat /etc/nix/nix.conf | ||||||
|     # cachix should be available and be able to configure a cache |     # cachix should be available and be able to configure a cache | ||||||
| @@ -46,7 +46,7 @@ jobs: | |||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-20.03 |         nix_path: nixpkgs=channel:nixos-22.11 | ||||||
|         extra_nix_config: | |         extra_nix_config: | | ||||||
|           sandbox = relaxed |           sandbox = relaxed | ||||||
|     - run: cat /etc/nix/nix.conf |     - run: cat /etc/nix/nix.conf | ||||||
| @@ -73,7 +73,7 @@ jobs: | |||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-22.05 |         nix_path: nixpkgs=channel:nixos-22.11 | ||||||
|         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 |         install_url: https://nixos-nix-install-tests.cachix.org/serve/s62m7lc0q0mz2mxxm9q0kkrcg90njzhq/install | ||||||
|     - run: nix-build test.nix |     - run: nix-build test.nix | ||||||
| @@ -88,7 +88,7 @@ jobs: | |||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-22.05 |         nix_path: nixpkgs=channel:nixos-22.11 | ||||||
|         install_url: https://releases.nixos.org/nix/nix-2.8.0/install |         install_url: https://releases.nixos.org/nix/nix-2.8.0/install | ||||||
|     - run: nix-build test.nix |     - run: nix-build test.nix | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ branding: | |||||||
| runs: | runs: | ||||||
|   using: 'composite' |   using: 'composite' | ||||||
|   steps: |   steps: | ||||||
|     - run : ${{ github.action_path }}/install-nix.sh |     - run : ${GITHUB_ACTION_PATH}/install-nix.sh | ||||||
|       shell: bash |       shell: bash | ||||||
|       env: |       env: | ||||||
|         INPUT_EXTRA_NIX_CONFIG: ${{ inputs.extra_nix_config }} |         INPUT_EXTRA_NIX_CONFIG: ${{ inputs.extra_nix_config }} | ||||||
|   | |||||||
| @@ -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 | ||||||
| @@ -66,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://nixos.org/nix/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--)) | ||||||
| @@ -78,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