From b29ae48286900c095f26542be45e67691ffe7691 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Thu, 16 Mar 2023 10:02:22 -0700 Subject: [PATCH] Reflect v0.6.0 changes --- README.md | 6 ++++-- action.yml | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 85dfc0a..6f21ee5 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,13 @@ See [`.github/workflows/ci.yml`](.github/workflows/ci.yml) for a full example. | `nix-installer-tag` | The tag of `nix-installer` to use (conflicts with `nix-installer-revision`, `nix-installer-branch`, `nix-installer-pr`) | string | | | `nix-installer-url` | A URL pointing to a `nix-installer.sh` script | URL | `https://install.determinate.systems/nix` | | `nix-package-url` | The Nix package URL | URL | | -| `planner` | The installation [planner] to use | enum (`linux-multi` or `macos`) | | +| `planner` | The installation [planner] to use | enum (`linux` or `macos`) | | | `reinstall` | Force a reinstall if an existing installation is detected (consider backing up `/nix/store`) | Boolean | `false` | | `start-daemon` | If the daemon should be started, requires `planner: linux-multi` | Boolean | `false` | | `trust-runner-user` | Whether to make the runner user trusted by the Nix daemon | Boolean | `true` | -| `diagnostic-endpoint` | Diagnostic endpoint url where the installer sends data to. To disable set this to an empty string. | string | `https://install.determinate.systems/nix/diagnostic` | +| `diagnostic-endpoint` | Diagnostic endpoint url where the installer sends install [diagnostic reports](https://github.com/DeterminateSystems/nix-installer#diagnostics) to, to disable set this to an empty string | string | `https://install.determinate.systems/nix/diagnostic` | +| `proxy` | The proxy to use (if any), valid proxy bases are `https://$URL`, `http://$URL` and `socks5://$URL` | string | | +| `ssl-cert-file` | An SSL cert to use (if any), used for fetching Nix and sets `NIX_SSL_CERT_FILE` for Nix | string | | [apfs]: https://en.wikipedia.org/wiki/Apple_File_System [backtrace]: https://doc.rust-lang.org/std/backtrace/index.html#environment-variables diff --git a/action.yml b/action.yml index 819f16c..9afe5b5 100644 --- a/action.yml +++ b/action.yml @@ -28,6 +28,12 @@ inputs: logger: description: The logger to use for install (eg. `pretty`, `json`, `full`, `compact`) required: false + ssl-cert-file: + description: "An SSL cert to use (if any), used for fetching Nix and sets `NIX_SSL_CERT_FILE` for Nix" + required: false + pproxy: + description: "The proxy to use (if any), valid proxy bases are `https://$URL`, `http://$URL` and `socks5://$URL`" + required: false mac-case-sensitive: description: "Use a case sensitive volume (`planner: macos` only)" required: false