From 9eec5fd5a2cc59bbc7a77f275cdf026cc4c93237 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 22 May 2024 17:27:53 -0300 Subject: [PATCH] Switch back to main branch of detsys-ts --- dist/index.js | 14 ++++++-------- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0c7b3e5..7d4656e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -94066,7 +94066,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq const external_node_stream_promises_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:stream/promises"); ;// CONCATENATED MODULE: external "node:zlib" const external_node_zlib_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:zlib"); -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@f1554c0d3a5f1114cff78879e50bc118451a03c0_t7eoi6mjzqgr2plrflke2xdf7i/node_modules/detsys-ts/dist/index.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@a089656286a58dc6767247181b5280826f20473a_q6benjgi5pgerrbnqocqupyoxq/node_modules/detsys-ts/dist/index.js var __defProp = Object.defineProperty; var __export = (target, all) => { for (var name in all) @@ -94676,9 +94676,8 @@ var DetSysAction = class { }); } /** - * Fetches a file in `.xz` format from the URL determined by the `source-*` - * parameters (or `source-binary` if set). It then imports that file's - * contents into the Nix store and returns the path of the executable at + * Unpacks the closure returned by `fetchArtifact()`, imports the + * contents into the Nix store, and returns the path of the executable at * `/nix/store/STORE_PATH/bin/${bin}`. */ async unpackClosure(bin) { @@ -94755,13 +94754,12 @@ var DetSysAction = class { } } /** - * Fetch an artifact, such as a tarball, from the URL determined by the `source-*` - * inputs or use a provided binary specified by the `source-binary` - * input. + * Fetch an artifact, such as a tarball, from the URL determined by the + * `source-*` inputs. */ async fetchArtifact() { const sourceBinary = getStringOrNull("source-binary"); - if (sourceBinary !== null) { + if (sourceBinary !== null && sourceBinary !== "") { core.debug(`Using the provided source binary at ${sourceBinary}`); return sourceBinary; } diff --git a/package.json b/package.json index f3278cb..73607f8 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": { "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", - "detsys-ts": "github:DeterminateSystems/detsys-ts#source-binary", + "detsys-ts": "github:DeterminateSystems/detsys-ts", "got": "^14.3.0", "tail": "^2.2.6" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3c75a4f..bd29d48 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^1.1.1 version: 1.1.1 detsys-ts: - specifier: github:DeterminateSystems/detsys-ts#source-binary - version: github.com/DeterminateSystems/detsys-ts/f1554c0d3a5f1114cff78879e50bc118451a03c0 + specifier: github:DeterminateSystems/detsys-ts + version: github.com/DeterminateSystems/detsys-ts/a089656286a58dc6767247181b5280826f20473a got: specifier: ^14.3.0 version: 14.3.0 @@ -3823,8 +3823,8 @@ packages: engines: {node: '>=10'} dev: true - github.com/DeterminateSystems/detsys-ts/f1554c0d3a5f1114cff78879e50bc118451a03c0: - resolution: {tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/f1554c0d3a5f1114cff78879e50bc118451a03c0} + github.com/DeterminateSystems/detsys-ts/a089656286a58dc6767247181b5280826f20473a: + resolution: {tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/a089656286a58dc6767247181b5280826f20473a} name: detsys-ts version: 1.0.0 dependencies: