lix-project/lix-install-action
1
0
Fork 0
Code Issues 11 Pull requests Packages Projects Releases Wiki Activity

Fix method of finding docker shims

Browse source
This commit is contained in:
Luc Perkins 2024-05-02 17:19:07 -03:00
parent 9ffa76fa74
commit 51bc05e2ea
No known key found for this signature in database
GPG key ID: 16DB1108FB591835
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dist/index.js generated vendored
View file

@ -89417,6 +89417,8 @@ function firstString() {
}
}
// EXTERNAL MODULE: external "node:process"
var external_node_process_ = __nccwpck_require__(7742);
// EXTERNAL MODULE: external "node:util"
var external_node_util_ = __nccwpck_require__(7261);
// EXTERNAL MODULE: external "os"
@ -90997,8 +90999,6 @@ class AbortError extends RequestError {
}
}
// EXTERNAL MODULE: external "node:process"
var external_node_process_ = __nccwpck_require__(7742);
;// CONCATENATED MODULE: external "node:buffer"
const external_node_buffer_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:buffer");
// EXTERNAL MODULE: external "node:stream"
@ -97268,6 +97268,7 @@ function mungeDiagnosticEndpoint(inputUrl) {
var EVENT_INSTALL_NIX_FAILURE = "install_nix_failure";
var EVENT_INSTALL_NIX_START = "install_nix_start";
var EVENT_INSTALL_NIX_SUCCESS = "install_nix_start";
@ -97698,8 +97699,8 @@ ${stderrBuffer}`
"Configuring the Docker shim as the Nix Daemon's process supervisor"
);
const images = {
X64: (0,external_node_path_namespaceObject.join)(__dirname, "/../docker-shim/amd64.tar.gz"),
ARM64: (0,external_node_path_namespaceObject.join)(__dirname, "/../docker-shim/arm64.tar.gz")
X64: (0,external_node_path_namespaceObject.join)((0,external_node_process_.cwd)(), "/../docker-shim/amd64.tar.gz"),
ARM64: (0,external_node_path_namespaceObject.join)((0,external_node_process_.cwd)(), "/../docker-shim/arm64.tar.gz")
};
const runnerArch = process.env["RUNNER_ARCH"];
let arch;

5
src/index.ts
View file

@ -6,6 +6,7 @@ import { join } from "node:path";
import fs from "node:fs";
import { userInfo } from "node:os";
import stringArgv from "string-argv";
import { cwd } from "node:process";
import { IdsToolbox, inputs, platform } from "detsys-ts";
import { randomUUID } from "node:crypto";
@ -558,8 +559,8 @@ class NixInstallerAction {
);
const images: { [key: string]: string } = {
X64: join(__dirname, "/../docker-shim/amd64.tar.gz"),
ARM64: join(__dirname, "/../docker-shim/arm64.tar.gz"),
X64: join(cwd(), "/../docker-shim/amd64.tar.gz"),
ARM64: join(cwd(), "/../docker-shim/arm64.tar.gz"),
};
const runnerArch = process.env["RUNNER_ARCH"];