Fix flakes example and add a test

Merge pull request #55 from numtide/idempotent
idempotent installation
2020-12-22 11:45:56 +01:00 · 2020-11-02 19:47:38 +01:00 · 2020-11-02 12:35:41 +01:00 · 2020-10-13 18:27:22 +02:00 · 2020-10-13 11:26:47 -04:00 · 2020-10-13 11:52:23 +02:00
5 changed files with 38 additions and 12 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -9,7 +9,7 @@ jobs:
  simple-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, macos-11.0]
+        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v2
@ -58,3 +58,23 @@ jobs:
          sandbox = relaxed
    - run: cat /etc/nix/nix.conf
    - run: nix-build test.nix --arg noChroot true
+
+  flakes:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Nix Flakes doesn't work on shallow clones
+        fetch-depth: 0
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - name: Install Nix
+      uses: ./
+      with:
+        install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
+        extra_nix_config: |
+          experimental-features = nix-command flakes
+    - run: nix flake show github:NixOS/nixpkgs
--- a/README.md
+++ b/README.md
@ -6,7 +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 [picking a channel](https://status.nixos.org/)
-or [pin nixpkgs yourself](https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html).
+or [pin nixpkgs yourself](https://nix.dev/reference/pinning-nixpkgs.html) 
+(see also [pinning tutorial](https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html)).

 # Features

@ -58,7 +59,7 @@ jobs:
          fetch-depth: 0
    - uses: cachix/install-nix-action@v11
      with:
-        install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-3.0pre20200820_4d77513/install
+        install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-3.0pre20201007_5257a25/install
        extra_nix_config: |
          experimental-features = nix-command flakes
    - run: nix-build
--- a/lib/install-nix.sh
+++ b/lib/install-nix.sh
@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail

+if type -p nix &>/dev/null ; then
+  echo "Aborting: Nix is already installed at $(type -p nix)"
+  exit
+fi
+
 # Configure Nix
 add_config() {
  echo "$1" | sudo tee -a /tmp/nix.conf >/dev/null
@ -35,15 +40,15 @@ 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"
+  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
-echo "::add-path::/nix/var/nix/profiles/per-user/$USER/profile/bin"
-echo "::add-path::/nix/var/nix/profiles/default/bin"
+echo "/nix/var/nix/profiles/per-user/$USER/profile/bin" >> $GITHUB_PATH
+echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH

 if [[ $INPUT_NIX_PATH != "" ]]; then
-  echo "::set-env name=NIX_PATH::${INPUT_NIX_PATH}"
+  echo "NIX_PATH=${INPUT_NIX_PATH}" >> $GITHUB_ENV
 fi
--- a/package.json
+++ b/package.json
@ -20,7 +20,7 @@
  "author": "Domen Kožar",
  "license": "ASL2",
  "dependencies": {
-    "@actions/core": "^1.1.0",
+    "@actions/core": "^1.2.6",
    "@actions/exec": "^1.0.1",
    "@actions/tool-cache": "^1.1.2"
  },
--- a/yarn.lock
+++ b/yarn.lock
@ -2,10 +2,10 @@
 # yarn lockfile v1


-"@actions/core@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.1.1.tgz#e08f3dbfe04721bb3d040f8fca2d6d7e1817b2e1"
-  integrity sha512-O5G6EmlzTVsng7VSpNtszIoQq6kOgMGNTFB/hmwKNNA4V71JyxImCIrL27vVHCt2Cb3ImkaCr6o27C2MV9Ylwg==
+"@actions/core@^1.1.0", "@actions/core@^1.2.6":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
+  integrity sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==

 "@actions/exec@^1.0.1":
  version "1.0.1"
Author	SHA1	Message	Date
Domen Kožar	0383d0d550	Fix flakes example and add a test	2020-12-22 11:45:56 +01:00
Domen Kožar	661bbdf5ce	Merge pull request #55 from numtide/idempotent idempotent installation	2020-11-02 19:47:38 +01:00
zimbatm	334bb6100b	idempotent installation Don't run the installer if Nix has already been installed on the host. We assume that the installed Nix is already in the desired state. This allows to share a given pipeline between hosted and self-hosted runners. Usually the self-hosted runners are long-lived and already have Nix installed.	2020-11-02 12:35:41 +01:00
Domen Kožar	d5ba40b697	Merge pull request #53 from bbarker/patch-1 Adding more useful pinning reference to readme	2020-10-13 18:27:22 +02:00
Brandon Elam Barker	fda16d28d8	Adding more useful pinning reference to readme	2020-10-13 11:26:47 -04:00
Domen Kožar	da678383b2	Merge pull request #52 from wamserma/patch-1 replace deprecated functions	2020-10-13 11:52:23 +02:00
Markus Wamser	8a37740405	replace deprecated functions this should fix #50	2020-10-12 23:04:59 +02:00
Domen Kožar	28b1d88f39	Merge pull request #49 from cachix/dependabot/npm_and_yarn/actions/core-1.2.6 Bump @actions/core from 1.1.1 to 1.2.6	2020-10-02 00:42:40 +03:00
dependabot[bot]	2767b618db	Bump @actions/core from 1.1.1 to 1.2.6 Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.1.1 to 1.2.6. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-01 17:21:05 +00:00