cleanup

Merge pull request #105 from cachix/resilient-install
Resilient installation
2021-11-12 08:41:39 -06:00 · 2021-11-11 16:25:04 -06:00 · 2021-11-11 16:19:39 -06:00 · 2021-11-11 16:19:02 -06:00 · 2021-11-08 10:36:25 -06:00 · 2021-11-05 15:47:08 -06:00
5 changed files with 17 additions and 25 deletions
--- a/.github/workflows/test.yml
+++ b/.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
--- a/README.md
+++ b/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'
--- a/tests/main.test.ts
+++ b/tests/main.test.ts
@ -1,4 +0,0 @@
-test('nothing', async() => {
-});
-
-// TODO: hopefully github actions will support integration tests
--- a/jest.config.js
+++ b/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
-}
--- a/lib/install-nix.sh
+++ b/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
-  echo "build-users-group =" > /etc/nix/nix.conf
+  add_config "build-users-group ="
 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
Author	SHA1	Message	Date
Domen Kožar	5f45af07a1	cleanup	2021-11-12 08:41:39 -06:00
Domen Kožar	489b4a2f78	Merge pull request #105 from cachix/resilient-install Resilient installation	2021-11-11 16:25:04 -06:00
Domen Kožar	b93cdea694	Merge pull request #109 from cachix/fix-97 fix #97: install nix config correctly for single-user- mode	2021-11-11 16:19:39 -06:00
Domen Kožar	783053eda6	Resilient installation	2021-11-11 16:19:02 -06:00
Domen Kožar	c664ef3126	fix #97 : install nix config correctly for single-user- mode	2021-11-08 10:36:25 -06:00
Domen Kožar	74ef8ad2cf	Merge pull request #108 from cachix/enable-experimental-features-by-default enable flakes & nix-command features by default	2021-11-05 15:47:08 -06:00
Domen Kožar	e776d8288c	Merge pull request #107 from cachix/dependabot/github_actions/actions/checkout-2.4.0 chore(deps): bump actions/checkout from 2.3.5 to 2.4.0	2021-11-05 15:29:06 -06:00
Domen Kožar	98f3210e45	v14.1	2021-11-03 06:03:26 -06:00
dependabot[bot]	8026a8b63f	chore(deps): bump actions/checkout from 2.3.5 to 2.4.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-11-03 00:02:18 +00:00