From 51bc05e2eaeb4e34e1d3919ea7b38a9788917307 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 17:19:07 -0300 Subject: [PATCH] Fix method of finding docker shims --- dist/index.js | 9 +++++---- src/index.ts | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index 651f17a..c1076f7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -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; diff --git a/src/index.ts b/src/index.ts index 7295bc0..2221c77 100644 --- a/src/index.ts +++ b/src/index.ts @@ -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"];