From b8629f9bbc0a33256d3fb9a272ac4fcf3eaad71c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Apr 2024 15:34:21 -0400 Subject: [PATCH] Update detsys-ts --- dist/index.js | 32 ++++++++++++++++++++++++-------- package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---------- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dist/index.js b/dist/index.js index 83504f0..606ac87 100644 --- a/dist/index.js +++ b/dist/index.js @@ -94412,7 +94412,7 @@ const got = source_create(defaults); -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@11b68d543f1daee6eca15814c2a7289121c389c6_x3kpdinfohfhwkluq24hvwynwu/node_modules/detsys-ts/dist/correlation.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/correlation.js function identify(projectName) { @@ -94433,20 +94433,33 @@ function identify(projectName) { "GITHUB_REPOSITORY_ID", "GITHUB_WORKFLOW", ]), - run: hashEnvironmentVariables("GHWR", [ + job: hashEnvironmentVariables("GHWJ", [ "GITHUB_SERVER_URL", "GITHUB_REPOSITORY_OWNER", "GITHUB_REPOSITORY_OWNER_ID", "GITHUB_REPOSITORY", "GITHUB_REPOSITORY_ID", + "GITHUB_WORKFLOW", + "GITHUB_JOB", + ]), + run: hashEnvironmentVariables("GHWJR", [ + "GITHUB_SERVER_URL", + "GITHUB_REPOSITORY_OWNER", + "GITHUB_REPOSITORY_OWNER_ID", + "GITHUB_REPOSITORY", + "GITHUB_REPOSITORY_ID", + "GITHUB_WORKFLOW", + "GITHUB_JOB", "GITHUB_RUN_ID", ]), - run_differentiator: hashEnvironmentVariables("GHWA", [ + run_differentiator: hashEnvironmentVariables("GHWJA", [ "GITHUB_SERVER_URL", "GITHUB_REPOSITORY_OWNER", "GITHUB_REPOSITORY_OWNER_ID", "GITHUB_REPOSITORY", "GITHUB_REPOSITORY_ID", + "GITHUB_WORKFLOW", + "GITHUB_JOB", "GITHUB_RUN_ID", "GITHUB_RUN_NUMBER", "GITHUB_RUN_ATTEMPT", @@ -94481,9 +94494,9 @@ function hashEnvironmentVariables(prefix, variables) { return `${prefix}-${hash.digest("hex")}`; } -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@11b68d543f1daee6eca15814c2a7289121c389c6_x3kpdinfohfhwkluq24hvwynwu/node_modules/detsys-ts/dist/package.json +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/package.json const package_namespaceObject = {"i8":"1.0.0"}; -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@11b68d543f1daee6eca15814c2a7289121c389c6_x3kpdinfohfhwkluq24hvwynwu/node_modules/detsys-ts/dist/platform.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/platform.js function getArchOs() { const envArch = process.env.RUNNER_ARCH; @@ -94513,7 +94526,7 @@ function getNixPlatform(archOs) { } } -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@11b68d543f1daee6eca15814c2a7289121c389c6_x3kpdinfohfhwkluq24hvwynwu/node_modules/detsys-ts/dist/sourcedef.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/sourcedef.js function constructSourceParameters(legacyPrefix) { const noisilyGetInput = (suffix) => { @@ -94573,7 +94586,7 @@ const validate = uuid_dist/* validate */.Gu; const stringify = uuid_dist/* stringify */.Pz; const parse = uuid_dist/* parse */.Qc; -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@11b68d543f1daee6eca15814c2a7289121c389c6_x3kpdinfohfhwkluq24hvwynwu/node_modules/detsys-ts/dist/main.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/main.js // eslint-disable-next-line import/extensions @@ -94696,7 +94709,10 @@ class IdsToolbox { ? error.toString() : JSON.stringify(error); this.addFact(FACT_FINAL_EXCEPTION, reportable); - if (this.executionPhase !== "post") { + if (this.executionPhase === "post") { + core.warning(reportable); + } + else { core.setFailed(reportable); } this.recordEvent(EVENT_EXCEPTION); diff --git a/package.json b/package.json index 9e53fd5..c602600 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@actions/exec": "^1.1.1", "@actions/github": "^5.1.1", "@actions/tool-cache": "^2.0.1", - "detsys-ts": "github:DeterminateSystems/detsys-ts#mnc-nits", + "detsys-ts": "github:DeterminateSystems/detsys-ts", "fetch-retry": "^5.0.6", "got": "^14.2.1", "string-argv": "^0.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 547afc0..de94bcd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ dependencies: specifier: ^2.0.1 version: 2.0.1 detsys-ts: - specifier: github:DeterminateSystems/detsys-ts#mnc-nits - version: github.com/DeterminateSystems/detsys-ts/11b68d543f1daee6eca15814c2a7289121c389c6 + specifier: github:DeterminateSystems/detsys-ts + version: github.com/DeterminateSystems/detsys-ts/3a315cdffd83d4b229d4fb16548d22a3756baf28 fetch-retry: specifier: ^5.0.6 version: 5.0.6 @@ -1358,8 +1358,8 @@ packages: engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 } hasBin: true dependencies: - caniuse-lite: 1.0.30001608 - electron-to-chromium: 1.4.734 + caniuse-lite: 1.0.30001609 + electron-to-chromium: 1.4.735 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: true @@ -1410,10 +1410,10 @@ packages: engines: { node: ">=6" } dev: true - /caniuse-lite@1.0.30001608: + /caniuse-lite@1.0.30001609: resolution: { - integrity: sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==, + integrity: sha512-JFPQs34lHKx1B5t1EpQpWH4c+29zIyn/haGsbpfq3suuV9v56enjFt23zqijxGTMwy1p/4H2tjnQMY+p1WoAyA==, } dev: true @@ -1675,10 +1675,10 @@ packages: esutils: 2.0.3 dev: true - /electron-to-chromium@1.4.734: + /electron-to-chromium@1.4.735: resolution: { - integrity: sha512-pYfGUc+ll8AOzLbLC0lfgwkvCZIV+sKGuFFsSNuF3K3ujrmem8jIjg/t6DNq0J7biTSS1hCt/Hts0nmA3ZyprQ==, + integrity: sha512-pkYpvwg8VyOTQAeBqZ7jsmpCjko1Qc6We1ZtZCjRyYbT5v4AIUKDy5cQTRotQlSSZmMr8jqpEt6JtOj5k7lR7A==, } dev: true @@ -4353,10 +4353,10 @@ packages: engines: { node: ">=10" } dev: true - github.com/DeterminateSystems/detsys-ts/11b68d543f1daee6eca15814c2a7289121c389c6: + github.com/DeterminateSystems/detsys-ts/3a315cdffd83d4b229d4fb16548d22a3756baf28: resolution: { - tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/11b68d543f1daee6eca15814c2a7289121c389c6, + tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/3a315cdffd83d4b229d4fb16548d22a3756baf28, } name: detsys-ts version: 1.0.0