Compare commits
	
		
			10 Commits
		
	
	
		
			macos-bump
			...
			fix/196
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 97a1be3c09 | ||
|  | 300721fe01 | ||
|  | fe6788c5de | ||
|  | 6a9a9e84a1 | ||
|  | 4509d84f10 | ||
|  | 5cfd5166ea | ||
|  | e02ea8c42e | ||
|  | fffc90f426 | ||
|  | 6ed004b9cc | ||
|  | 16b951426e | 
							
								
								
									
										14
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.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@v3 |     - uses: actions/checkout@v4 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
| @@ -28,7 +28,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@v3 |     - uses: actions/checkout@v4 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
| @@ -42,7 +42,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@v3 |     - uses: actions/checkout@v4 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
| @@ -58,7 +58,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@v3 |     - uses: actions/checkout@v4 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|     - run: nix flake show github:NixOS/nixpkgs |     - run: nix flake show github:NixOS/nixpkgs | ||||||
| @@ -69,7 +69,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@v3 |     - uses: actions/checkout@v4 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
| @@ -84,7 +84,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@v3 |     - uses: actions/checkout@v4 | ||||||
|     - name: Install Nix |     - name: Install Nix | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
| @@ -98,7 +98,7 @@ jobs: | |||||||
|           os: [ubuntu-latest] |           os: [ubuntu-latest] | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v3 |     - uses: actions/checkout@v4 | ||||||
|     - run: curl https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash |     - run: curl https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash | ||||||
|     - run: docker pull ghcr.io/catthehacker/ubuntu:js-20.04 |     - 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 |     - 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 default it has no nixpkgs configured, you have to set `nix_path` | ||||||
| by [picking a channel](https://status.nixos.org/) | by [picking a channel](https://status.nixos.org/) | ||||||
| or [pin nixpkgs yourself](https://nix.dev/reference/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.html)). | (see also [pinning tutorial](https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs)). | ||||||
|  |  | ||||||
| # Features | # Features | ||||||
|  |  | ||||||
| @@ -34,7 +34,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@v20 |     - uses: cachix/install-nix-action@v22 | ||||||
|       with: |       with: | ||||||
|         nix_path: nixpkgs=channel:nixos-unstable |         nix_path: nixpkgs=channel:nixos-unstable | ||||||
|     - run: nix-build |     - run: nix-build | ||||||
| @@ -52,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@v20 |     - uses: cachix/install-nix-action@v22 | ||||||
|       with: |       with: | ||||||
|         github_access_token: ${{ secrets.GITHUB_TOKEN }} |         github_access_token: ${{ secrets.GITHUB_TOKEN }} | ||||||
|     - run: nix build |     - 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: | install-nix-action's own `extra_nix_config` input: | ||||||
|  |  | ||||||
| ```yaml | ```yaml | ||||||
| - uses: cachix/install-nix-action@v20 | - uses: cachix/install-nix-action@v22 | ||||||
|   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= | ||||||
|   | |||||||
| @@ -17,6 +17,7 @@ trap 'rm -rf "$workdir"' EXIT | |||||||
| add_config() { | add_config() { | ||||||
|   echo "$1" >> "$workdir/nix.conf" |   echo "$1" >> "$workdir/nix.conf" | ||||||
| } | } | ||||||
|  | add_config "show-trace = true" | ||||||
| # 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 | if [[ $OSTYPE =~ darwin ]]; then | ||||||
| @@ -24,11 +25,18 @@ if [[ $OSTYPE =~ darwin ]]; then | |||||||
| fi | 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 a GitHub access token. | ||||||
|  | # Token-less access is subject to lower rate limits. | ||||||
| if [[ -n "${INPUT_GITHUB_ACCESS_TOKEN:-}" ]]; then | 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" |   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" |   add_config "access-tokens = github.com=$GITHUB_TOKEN" | ||||||
|  | else | ||||||
|  |   echo "::debug::Continuing without a GitHub access token" | ||||||
| fi | fi | ||||||
| # Append extra nix configuration if provided | # Append extra nix configuration if provided | ||||||
| if [[ -n "${INPUT_EXTRA_NIX_CONFIG:-}" ]]; then | if [[ -n "${INPUT_EXTRA_NIX_CONFIG:-}" ]]; then | ||||||
| @@ -69,7 +77,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.16.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 | do | ||||||
|   sleep 1 |   sleep 1 | ||||||
|   ((curl_retries--)) |   ((curl_retries--)) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user