Compare commits
	
		
			13 Commits
		
	
	
		
			macos
			...
			check-spac
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 73ea859441 | ||
|  | bc19d99f45 | ||
|  | ebed63b0a2 | ||
|  | 5c21a08208 | ||
|  | 9affe1ce81 | ||
|  | ef735e86b9 | ||
|  | 4856b67e4a | ||
|  | 6e3de2b50b | ||
|  | d8ecc134bc | ||
|  | dba72516a1 | ||
|  | df989ac1d6 | ||
|  | a5f8eada85 | ||
|  | f57eb6b95e | 
							
								
								
									
										20
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,21 +4,7 @@ on: | |||||||
|   push: |   push: | ||||||
| jobs: | jobs: | ||||||
|   tests: |   tests: | ||||||
|     strategy: |     runs-on: ubuntu-latest | ||||||
|       matrix: |  | ||||||
|         os: [ubuntu-18.04, macos-latest] |  | ||||||
|     runs-on: ${{ matrix.os }} |  | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v1 |       - run: sudo du -sh /var/* | ||||||
|     - run: yarn install --frozen-lockfile |       - run: sudo du -sh /usr/* | ||||||
|     - run: yarn build |  | ||||||
|     # TODO: just commit it using github |  | ||||||
|     - run: git diff --exit-code |  | ||||||
|     - run: yarn test |  | ||||||
|     - name: Install Nix |  | ||||||
|       uses: ./ |  | ||||||
|     - run: nix-env -iA cachix -f https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde |  | ||||||
|     - run: cat /etc/nix/nix.conf |  | ||||||
|     # cachix should be available and be able to configure a cache |  | ||||||
|     - run: cachix use cachix |  | ||||||
|     - run: nix-build test.nix |  | ||||||
|   | |||||||
| @@ -17,8 +17,8 @@ jobs: | |||||||
|   tests: |   tests: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v1 |     - uses: actions/checkout@v2 | ||||||
|     - uses: cachix/install-nix-action@v6 |     - uses: cachix/install-nix-action@v7 | ||||||
|     - run: nix-build |     - run: nix-build | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										48
									
								
								lib/install-nix.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										48
									
								
								lib/install-nix.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,48 @@ | |||||||
|  | #!/usr/bin/env bash | ||||||
|  | set -euo pipefail | ||||||
|  |  | ||||||
|  | export here=$(dirname "${BASH_SOURCE[0]}") | ||||||
|  |  | ||||||
|  | nixConf() { | ||||||
|  |   sudo mkdir -p /etc/nix | ||||||
|  |   # Workaround a segfault: https://github.com/NixOS/nix/issues/2733 | ||||||
|  |   sudo sh -c 'echo http2 = false >> /etc/nix/nix.conf' | ||||||
|  |   # Set jobs to number of cores | ||||||
|  |   sudo sh -c 'echo max-jobs = auto >> /etc/nix/nix.conf' | ||||||
|  |   # Allow binary caches for runner user | ||||||
|  |   sudo sh -c 'echo trusted-users = root runner >> /etc/nix/nix.conf' | ||||||
|  | } | ||||||
|  |  | ||||||
|  | if [[ $OSTYPE =~ darwin ]]; then | ||||||
|  |   # Catalina workaround https://github.com/NixOS/nix/issues/2925 | ||||||
|  |   $here/create-darwin-volume.sh | ||||||
|  |  | ||||||
|  |   # Disable spotlight indexing of /nix to speed up performance | ||||||
|  |   sudo mdutil -i off /nix | ||||||
|  | fi | ||||||
|  |  | ||||||
|  | nixConf | ||||||
|  |  | ||||||
|  | # Needed due to multi-user being too defensive | ||||||
|  | export ALLOW_PREEXISTING_INSTALLATION=1 | ||||||
|  |  | ||||||
|  | sh <(curl -L https://nixos.org/nix/install) --daemon | ||||||
|  |  | ||||||
|  | # write nix.conf again as installation overwrites it | ||||||
|  | nixConf | ||||||
|  |  | ||||||
|  | # macOS needs certificates hints | ||||||
|  | if [[ $OSTYPE =~ darwin ]]; then | ||||||
|  |   cert_file=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt | ||||||
|  |   echo "::set-env name=NIX_SSL_CERT_FILE::$cert_file" | ||||||
|  |   export NIX_SSL_CERT_FILE=$cert_file | ||||||
|  |   sudo launchctl setenv NIX_SSL_CERT_FILE "$cert_file" | ||||||
|  | fi | ||||||
|  |  | ||||||
|  | # Reload the daemon to pick up changes | ||||||
|  | sudo pkill -HUP nix-daemon | ||||||
|  |  | ||||||
|  | # Set paths | ||||||
|  | echo "::add-path::/nix/var/nix/profiles/per-user/runner/profile/bin" | ||||||
|  | echo "::add-path::/nix/var/nix/profiles/default/bin" | ||||||
|  | echo "::set-env name=NIX_PATH::/nix/var/nix/profiles/per-user/root/channels" | ||||||
							
								
								
									
										59
									
								
								lib/main.js
									
									
									
									
									
								
							
							
						
						
									
										59
									
								
								lib/main.js
									
									
									
									
									
								
							| @@ -8,65 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge | |||||||
|         step((generator = generator.apply(thisArg, _arguments || [])).next()); |         step((generator = generator.apply(thisArg, _arguments || [])).next()); | ||||||
|     }); |     }); | ||||||
| }; | }; | ||||||
| var __importStar = (this && this.__importStar) || function (mod) { |  | ||||||
|     if (mod && mod.__esModule) return mod; |  | ||||||
|     var result = {}; |  | ||||||
|     if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; |  | ||||||
|     result["default"] = mod; |  | ||||||
|     return result; |  | ||||||
| }; |  | ||||||
| Object.defineProperty(exports, "__esModule", { value: true }); | Object.defineProperty(exports, "__esModule", { value: true }); | ||||||
| const core = __importStar(require("@actions/core")); |  | ||||||
| const exec = __importStar(require("@actions/exec")); |  | ||||||
| const tc = __importStar(require("@actions/tool-cache")); |  | ||||||
| const child_process_1 = require("child_process"); | const child_process_1 = require("child_process"); | ||||||
| const os_1 = require("os"); |  | ||||||
| const process_1 = require("process"); | const process_1 = require("process"); | ||||||
| const net_1 = require("net"); | const net_1 = require("net"); | ||||||
| function nixConf() { |  | ||||||
|     return __awaiter(this, void 0, void 0, function* () { |  | ||||||
|         // Workaround a segfault: https://github.com/NixOS/nix/issues/2733 |  | ||||||
|         yield exec.exec("sudo", ["mkdir", "-p", "/etc/nix"]); |  | ||||||
|         yield exec.exec("sudo", ["sh", "-c", "echo http2 = false >> /etc/nix/nix.conf"]); |  | ||||||
|         // Set jobs to number of cores |  | ||||||
|         yield exec.exec("sudo", ["sh", "-c", "echo max-jobs = auto >> /etc/nix/nix.conf"]); |  | ||||||
|         // Allow binary caches for runner user |  | ||||||
|         yield exec.exec("sudo", ["sh", "-c", "echo trusted-users = root runner >> /etc/nix/nix.conf"]); |  | ||||||
|     }); |  | ||||||
| } |  | ||||||
| function run() { |  | ||||||
|     return __awaiter(this, void 0, void 0, function* () { |  | ||||||
|         try { |  | ||||||
|             const PATH = process.env.PATH; |  | ||||||
|             yield nixConf(); |  | ||||||
|             // Catalina workaround https://github.com/NixOS/nix/issues/2925 |  | ||||||
|             if (os_1.type() == "Darwin") { |  | ||||||
|                 child_process_1.execFileSync(`${__dirname}/create-darwin-volume.sh`, { stdio: 'inherit' }); |  | ||||||
|             } |  | ||||||
|             // Needed due to multi-user being too defensive |  | ||||||
|             core.exportVariable('ALLOW_PREEXISTING_INSTALLATION', "1"); |  | ||||||
|             // TODO: retry due to all the things that can go wrong |  | ||||||
|             const nixInstall = yield tc.downloadTool('https://nixos.org/nix/install'); |  | ||||||
|             yield exec.exec("sh", [nixInstall, "--daemon"]); |  | ||||||
|             // write nix.conf again as installation overwrites it, reload the daemon to pick up changes |  | ||||||
|             yield nixConf(); |  | ||||||
|             yield exec.exec("sudo", ["pkill", "-HUP", "nix-daemon"]); |  | ||||||
|             // setup env |  | ||||||
|             core.exportVariable('PATH', `${PATH}:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/per-user/runner/profile/bin`); |  | ||||||
|             core.exportVariable('NIX_PATH', `/nix/var/nix/profiles/per-user/root/channels`); |  | ||||||
|             if (os_1.type() == "Darwin") { |  | ||||||
|                 // macOS needs certificates hints |  | ||||||
|                 core.exportVariable('NIX_SSL_CERT_FILE', '/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt'); |  | ||||||
|                 // TODO: nc doesn't work correctly on macOS :( |  | ||||||
|                 yield awaitSocket(); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         catch (error) { |  | ||||||
|             core.setFailed(`Action failed with error: ${error}`); |  | ||||||
|             throw (error); |  | ||||||
|         } |  | ||||||
|     }); |  | ||||||
| } |  | ||||||
| function awaitSocket() { | function awaitSocket() { | ||||||
|     return __awaiter(this, void 0, void 0, function* () { |     return __awaiter(this, void 0, void 0, function* () { | ||||||
|         const daemonSocket = net_1.createConnection({ path: '/nix/var/nix/daemon-socket/socket' }); |         const daemonSocket = net_1.createConnection({ path: '/nix/var/nix/daemon-socket/socket' }); | ||||||
| @@ -80,4 +25,6 @@ function awaitSocket() { | |||||||
|         }); |         }); | ||||||
|     }); |     }); | ||||||
| } | } | ||||||
| run(); | child_process_1.execFileSync(`${__dirname}/install-nix.sh`, { stdio: 'inherit' }); | ||||||
|  | // nc doesn't work correctly on macOS :( | ||||||
|  | awaitSocket(); | ||||||
|   | |||||||
| @@ -1,8 +0,0 @@ | |||||||
| "use strict"; |  | ||||||
| Object.defineProperty(exports, "__esModule", { value: true }); |  | ||||||
| function extrasperse(elem, array) { |  | ||||||
|     const init = []; |  | ||||||
|     return array.reduce((r, a) => r.concat(elem, a), init); |  | ||||||
| } |  | ||||||
| exports.extrasperse = extrasperse; |  | ||||||
| ; |  | ||||||
							
								
								
									
										65
									
								
								src/main.ts
									
									
									
									
									
								
							
							
						
						
									
										65
									
								
								src/main.ts
									
									
									
									
									
								
							| @@ -1,60 +1,6 @@ | |||||||
| import * as core from '@actions/core'; | import { execFileSync } from 'child_process'; | ||||||
| import * as exec from '@actions/exec'; | import { exit } from 'process'; | ||||||
| import * as tc from '@actions/tool-cache'; | import { createConnection } from 'net'; | ||||||
| import {execFileSync} from 'child_process'; |  | ||||||
| import {type} from 'os'; |  | ||||||
| import {exit} from 'process'; |  | ||||||
| import {createConnection} from 'net'; |  | ||||||
|  |  | ||||||
| async function nixConf() { |  | ||||||
|     // Workaround a segfault: https://github.com/NixOS/nix/issues/2733 |  | ||||||
|     await exec.exec("sudo", ["mkdir", "-p", "/etc/nix"]); |  | ||||||
|     await exec.exec("sudo", ["sh", "-c", "echo http2 = false >> /etc/nix/nix.conf"]); |  | ||||||
|  |  | ||||||
|     // Set jobs to number of cores |  | ||||||
|     await exec.exec("sudo", ["sh", "-c", "echo max-jobs = auto >> /etc/nix/nix.conf"]); |  | ||||||
|  |  | ||||||
|     // Allow binary caches for runner user |  | ||||||
|     await exec.exec("sudo", ["sh", "-c", "echo trusted-users = root runner >> /etc/nix/nix.conf"]); |  | ||||||
| } |  | ||||||
|  |  | ||||||
| async function run() { |  | ||||||
|   try { |  | ||||||
|     const PATH = process.env.PATH; |  | ||||||
|   |  | ||||||
|     await nixConf(); |  | ||||||
|  |  | ||||||
|     // Catalina workaround https://github.com/NixOS/nix/issues/2925 |  | ||||||
|     if (type() == "Darwin") { |  | ||||||
|       execFileSync(`${__dirname}/create-darwin-volume.sh`, { stdio: 'inherit' }); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     // Needed due to multi-user being too defensive |  | ||||||
|     core.exportVariable('ALLOW_PREEXISTING_INSTALLATION', "1");  |  | ||||||
|  |  | ||||||
|     // TODO: retry due to all the things that can go wrong |  | ||||||
|     const nixInstall = await tc.downloadTool('https://nixos.org/nix/install'); |  | ||||||
|     await exec.exec("sh", [nixInstall, "--daemon"]); |  | ||||||
|  |  | ||||||
|     // write nix.conf again as installation overwrites it, reload the daemon to pick up changes |  | ||||||
|     await nixConf(); |  | ||||||
|     await exec.exec("sudo", ["pkill", "-HUP", "nix-daemon"]); |  | ||||||
|  |  | ||||||
|     // setup env |  | ||||||
|     core.exportVariable('PATH', `${PATH}:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/per-user/runner/profile/bin`) |  | ||||||
|     core.exportVariable('NIX_PATH', `/nix/var/nix/profiles/per-user/root/channels`) |  | ||||||
|     if (type() == "Darwin") { |  | ||||||
|       // macOS needs certificates hints |  | ||||||
|       core.exportVariable('NIX_SSL_CERT_FILE', '/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt'); |  | ||||||
|  |  | ||||||
|       // TODO: nc doesn't work correctly on macOS :( |  | ||||||
|       await awaitSocket(); |  | ||||||
|     } |  | ||||||
|   } catch (error) { |  | ||||||
|     core.setFailed(`Action failed with error: ${error}`); |  | ||||||
|     throw(error); |  | ||||||
|   } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| async function awaitSocket() { | async function awaitSocket() { | ||||||
|   const daemonSocket = createConnection({ path: '/nix/var/nix/daemon-socket/socket' }); |   const daemonSocket = createConnection({ path: '/nix/var/nix/daemon-socket/socket' }); | ||||||
| @@ -68,4 +14,7 @@ async function awaitSocket() { | |||||||
|   }); |   }); | ||||||
| } | } | ||||||
|  |  | ||||||
| run(); | execFileSync(`${__dirname}/install-nix.sh`, { stdio: 'inherit' }); | ||||||
|  |  | ||||||
|  | // nc doesn't work correctly on macOS :( | ||||||
|  | awaitSocket(); | ||||||
		Reference in New Issue
	
	Block a user