From 642cfa0200128cfdd6c201f97398c427100891a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 May 2020 14:34:45 +0200 Subject: [PATCH 1/3] Prepare for Nix 2.3.5 --- .github/workflows/test.yml | 4 +++- lib/install-nix.sh | 36 +++++++----------------------------- lib/main.js | 26 -------------------------- src/main.ts | 17 ----------------- 4 files changed, 10 insertions(+), 73 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b71fd4..53f9679 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ jobs: tests: strategy: matrix: - os: [ubuntu-18.04, macos-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -14,6 +14,8 @@ jobs: - run: yarn build - name: Install Nix uses: ./ + with: + install_url: https://static.domenkozar.com/install-2.3.5-pre - 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 diff --git a/lib/install-nix.sh b/lib/install-nix.sh index 7bd47c2..4ba8ebc 100755 --- a/lib/install-nix.sh +++ b/lib/install-nix.sh @@ -1,47 +1,25 @@ #!/usr/bin/env bash set -euo pipefail -export here=$(dirname "${BASH_SOURCE[0]}") +# Set jobs to number of cores +sudo sh -c 'echo max-jobs = auto >> /tmp/nix.conf' +# Allow binary caches for runner user +sudo sh -c 'echo trusted-users = root runner >> /tmp/nix.conf' -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' -} +sh <(curl -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \ + --daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume 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 ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) --daemon - -# write nix.conf again as installation overwrites it -nixConf - -# macOS needs certificates hints -if [[ $OSTYPE =~ darwin ]]; then + # macOS needs certificates hints 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" diff --git a/lib/main.js b/lib/main.js index abb019e..8bf216e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,30 +1,4 @@ "use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; Object.defineProperty(exports, "__esModule", { value: true }); const child_process_1 = require("child_process"); -const process_1 = require("process"); -const net_1 = require("net"); -function awaitSocket() { - return __awaiter(this, void 0, void 0, function* () { - const daemonSocket = net_1.createConnection({ path: '/nix/var/nix/daemon-socket/socket' }); - daemonSocket.on('error', () => __awaiter(this, void 0, void 0, function* () { - console.log('Waiting for daemon socket to be available, reconnecting...'); - yield new Promise(resolve => setTimeout(resolve, 500)); - yield awaitSocket(); - })); - daemonSocket.on('connect', () => { - process_1.exit(0); - }); - }); -} child_process_1.execFileSync(`${__dirname}/install-nix.sh`, { stdio: 'inherit' }); -// nc doesn't work correctly on macOS :( -awaitSocket(); diff --git a/src/main.ts b/src/main.ts index 07313e3..492e4e6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,20 +1,3 @@ import { execFileSync } from 'child_process'; -import { exit } from 'process'; -import { createConnection } from 'net'; - -async function awaitSocket() { - const daemonSocket = createConnection({ path: '/nix/var/nix/daemon-socket/socket' }); - daemonSocket.on('error', async () => { - console.log('Waiting for daemon socket to be available, reconnecting...'); - await new Promise(resolve => setTimeout(resolve, 500)); - await awaitSocket(); - }); - daemonSocket.on('connect', () => { - exit(0); - }); -} execFileSync(`${__dirname}/install-nix.sh`, { stdio: 'inherit' }); - -// nc doesn't work correctly on macOS :( -awaitSocket(); \ No newline at end of file From 10a7d51bce0ae08f4e3e75b2db1a82257469ad57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 May 2020 13:17:01 +0200 Subject: [PATCH 2/3] allow skipping channel installation --- .github/workflows/test.yml | 21 +++++++++++++++++---- action.yml | 2 ++ lib/install-nix.sh | 14 +++++++++++--- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53f9679..858bf10 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ on: pull_request: push: jobs: - tests: + simple-build: strategy: matrix: os: [ubuntu-latest, macos-latest] @@ -14,10 +14,23 @@ jobs: - run: yarn build - name: Install Nix uses: ./ - with: - install_url: https://static.domenkozar.com/install-2.3.5-pre - - run: nix-env -iA cachix -f https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde + - run: nix-env -iA cachix -f https://cachix.org/api/v1/install - 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 + no-channel: + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - run: yarn install --frozen-lockfile + - run: yarn build + - name: Install Nix + uses: ./ + with: + skip_adding_nixpkgs_channel: true + - run: nix-build test.nix && exit 1 || echo "OK" + - run: NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde nix-build test.nix \ No newline at end of file diff --git a/action.yml b/action.yml index d54e033..edeb03a 100644 --- a/action.yml +++ b/action.yml @@ -4,6 +4,8 @@ author: 'Domen Kožar' inputs: install_url: description: 'Installation URL that will contain a script to install Nix' + skip_adding_nixpkgs_channel: + description: 'Skip adding nixpkgs-unstable channel' branding: color: 'blue' icon: 'sun' diff --git a/lib/install-nix.sh b/lib/install-nix.sh index 4ba8ebc..703a958 100755 --- a/lib/install-nix.sh +++ b/lib/install-nix.sh @@ -6,8 +6,14 @@ sudo sh -c 'echo max-jobs = auto >> /tmp/nix.conf' # Allow binary caches for runner user sudo sh -c 'echo trusted-users = root runner >> /tmp/nix.conf' -sh <(curl -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \ - --daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume +if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" ]]; then + extra_cmd=--no-channel-add +else + extra_cmd= +fi + +sh <(curl -L ${INPUT_INSTALL_URL:-https://static.domenkozar.com/install-2.3.5-pre}) \ + --daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume $extra_cmd if [[ $OSTYPE =~ darwin ]]; then # Disable spotlight indexing of /nix to speed up performance @@ -23,4 +29,6 @@ fi # 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" \ No newline at end of file +if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL != "true" ]]; then +echo "::set-env name=NIX_PATH::/nix/var/nix/profiles/per-user/root/channels" +fi \ No newline at end of file From f68249e9093ed1cb904a513e9169574ac41ca046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 May 2020 16:39:05 +0200 Subject: [PATCH 3/3] Nix 2.3.5 --- lib/install-nix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/install-nix.sh b/lib/install-nix.sh index 703a958..711199f 100755 --- a/lib/install-nix.sh +++ b/lib/install-nix.sh @@ -12,7 +12,7 @@ else extra_cmd= fi -sh <(curl -L ${INPUT_INSTALL_URL:-https://static.domenkozar.com/install-2.3.5-pre}) \ +sh <(curl -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \ --daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume $extra_cmd if [[ $OSTYPE =~ darwin ]]; then