mirror of
https://github.com/DeterminateSystems/nix-installer-action.git
synced 2024-12-23 13:32:06 +01:00
More review feedback
This commit is contained in:
parent
ea2f18de2f
commit
3d54c0c487
3 changed files with 3 additions and 5 deletions
3
dist/index.js
vendored
3
dist/index.js
vendored
|
@ -179,7 +179,6 @@ class NixInstallerAction {
|
||||||
extra_conf += "\n";
|
extra_conf += "\n";
|
||||||
}
|
}
|
||||||
if (this.trust_runner_user !== null) {
|
if (this.trust_runner_user !== null) {
|
||||||
// TODO: Consider how to improve this
|
|
||||||
extra_conf += `trusted-users = root ${process.env.USER}`;
|
extra_conf += `trusted-users = root ${process.env.USER}`;
|
||||||
extra_conf += "\n";
|
extra_conf += "\n";
|
||||||
}
|
}
|
||||||
|
@ -189,7 +188,7 @@ class NixInstallerAction {
|
||||||
}
|
}
|
||||||
execution_env.NIX_INSTALLER_EXTRA_CONF = extra_conf;
|
execution_env.NIX_INSTALLER_EXTRA_CONF = extra_conf;
|
||||||
if (process.env.ACT && !process.env.NOT_ACT) {
|
if (process.env.ACT && !process.env.NOT_ACT) {
|
||||||
actions_core.info("Detected `$ACT` environment, assuming this is a https://github.com/nektos/act created container, set `NOT_ACT=true` to override this. This will change the settings of the `init` as well as `extra-conf` to be compatible with `act`");
|
actions_core.info("Detected `$ACT` environment, assuming this is a https://github.com/nektos/act created container, set `NOT_ACT=true` to override this. This will change the setting of the `init` to be compatible with `act`");
|
||||||
execution_env.NIX_INSTALLER_INIT = "none";
|
execution_env.NIX_INSTALLER_INIT = "none";
|
||||||
}
|
}
|
||||||
return execution_env;
|
return execution_env;
|
||||||
|
|
2
dist/index.js.map
vendored
2
dist/index.js.map
vendored
File diff suppressed because one or more lines are too long
|
@ -201,7 +201,6 @@ class NixInstallerAction {
|
||||||
extra_conf += "\n";
|
extra_conf += "\n";
|
||||||
}
|
}
|
||||||
if (this.trust_runner_user !== null) {
|
if (this.trust_runner_user !== null) {
|
||||||
// TODO: Consider how to improve this
|
|
||||||
extra_conf += `trusted-users = root ${process.env.USER}`;
|
extra_conf += `trusted-users = root ${process.env.USER}`;
|
||||||
extra_conf += "\n";
|
extra_conf += "\n";
|
||||||
}
|
}
|
||||||
|
@ -213,7 +212,7 @@ class NixInstallerAction {
|
||||||
|
|
||||||
if (process.env.ACT && !process.env.NOT_ACT) {
|
if (process.env.ACT && !process.env.NOT_ACT) {
|
||||||
actions_core.info(
|
actions_core.info(
|
||||||
"Detected `$ACT` environment, assuming this is a https://github.com/nektos/act created container, set `NOT_ACT=true` to override this. This will change the settings of the `init` as well as `extra-conf` to be compatible with `act`",
|
"Detected `$ACT` environment, assuming this is a https://github.com/nektos/act created container, set `NOT_ACT=true` to override this. This will change the setting of the `init` to be compatible with `act`",
|
||||||
);
|
);
|
||||||
execution_env.NIX_INSTALLER_INIT = "none";
|
execution_env.NIX_INSTALLER_INIT = "none";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue