cleanup

Resilient installation

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - name: Install Nix
@@ -31,7 +31,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - name: Install Nix
@@ -47,7 +47,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - name: Install Nix
@@ -65,7 +65,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - name: Install Nix
@@ -83,7 +83,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - name: Install Nix

README.md

@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
+    - uses: cachix/install-nix-action@v14.1
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - run: nix-build
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v14
+    - uses: cachix/install-nix-action@v14.1
       with:
         install_url: https://nixos-nix-install-tests.cachix.org/serve/vij683ly7sl95nnhb67bdjjfabclr85m/install
         install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'

__tests__/main.test.ts

@@ -1,4 +0,0 @@
-test('nothing', async() => {
-});
-
-// TODO: hopefully github actions will support integration tests

jest.config.js

@@ -1,11 +0,0 @@
-module.exports = {
-  clearMocks: true,
-  moduleFileExtensions: ['js', 'ts'],
-  testEnvironment: 'node',
-  testMatch: ['**/*.test.ts'],
-  testRunner: 'jest-circus/runner',
-  transform: {
-    '^.+\\.ts$': 'ts-jest'
-  },
-  verbose: true
-}

lib/install-nix.sh

@@ -38,8 +38,7 @@ if [[ $OSTYPE =~ darwin || -e /run/systemd/system ]]; then
 else
   # "fix" the following error when running nix*
   # error: the group 'nixbld' specified in 'build-users-group' does not exist
-  mkdir -m 0755 /etc/nix
+  add_config "build-users-group ="
-  echo "build-users-group =" > /etc/nix/nix.conf
 fi
 
 if [[ $INPUT_INSTALL_OPTIONS != "" ]]; then
@@ -48,7 +47,15 @@ if [[ $INPUT_INSTALL_OPTIONS != "" ]]; then
 fi
 
 echo "installer options: ${installer_options[@]}"
-sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") "${installer_options[@]}"
+
+# There is --retry-on-errors, but only newer curl versions support that
+until curl -o /tmp/install -v --fail --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}" 
+do
+  sleep 1
+done
+
+chmod +x /tmp/install
+sh /tmp/install "${installer_options[@]}"
 
 if [[ $OSTYPE =~ darwin ]]; then
   # macOS needs certificates hints