From 5b248e3390d495cc7cafd8a30272500346ae2537 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Tue, 28 Feb 2023 13:07:41 +0300 Subject: [PATCH 1/2] fix: allow overwrite service_job_id --- dist/index.js | 2 +- src/run.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 41f66262..87b49804 100644 --- a/dist/index.js +++ b/dist/index.js @@ -40794,7 +40794,7 @@ function run() { if (endpoint != '') { process.env.COVERALLS_ENDPOINT = endpoint; } - const runId = process.env.GITHUB_RUN_ID; + const runId = process.env.COVERALLS_SERVICE_JOB_ID === '' ? process.env.GITHUB_RUN_ID : process.env.COVERALLS_SERVICE_JOB_ID; process.env.COVERALLS_SERVICE_JOB_ID = runId; const carryforward = core.getInput('carryforward'); if (carryforward != '') { diff --git a/src/run.ts b/src/run.ts index 183a11ce..5217a974 100644 --- a/src/run.ts +++ b/src/run.ts @@ -55,7 +55,7 @@ export async function run() { process.env.COVERALLS_ENDPOINT = endpoint; } - const runId = process.env.GITHUB_RUN_ID; + const runId = process.env.COVERALLS_SERVICE_JOB_ID === '' ? process.env.GITHUB_RUN_ID : process.env.COVERALLS_SERVICE_JOB_ID; process.env.COVERALLS_SERVICE_JOB_ID = runId; const carryforward = core.getInput('carryforward'); From 84945c1b288a7e1a9e9dac95eed6448a8e75f363 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Tue, 28 Feb 2023 13:54:54 +0300 Subject: [PATCH 2/2] fix: don't compare to empty string --- dist/index.js | 2 +- src/run.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 87b49804..3f651098 100644 --- a/dist/index.js +++ b/dist/index.js @@ -40794,7 +40794,7 @@ function run() { if (endpoint != '') { process.env.COVERALLS_ENDPOINT = endpoint; } - const runId = process.env.COVERALLS_SERVICE_JOB_ID === '' ? process.env.GITHUB_RUN_ID : process.env.COVERALLS_SERVICE_JOB_ID; + const runId = process.env.COVERALLS_SERVICE_JOB_ID ? process.env.COVERALLS_SERVICE_JOB_ID : process.env.GITHUB_RUN_ID; process.env.COVERALLS_SERVICE_JOB_ID = runId; const carryforward = core.getInput('carryforward'); if (carryforward != '') { diff --git a/src/run.ts b/src/run.ts index 5217a974..6bb03f8d 100644 --- a/src/run.ts +++ b/src/run.ts @@ -55,7 +55,7 @@ export async function run() { process.env.COVERALLS_ENDPOINT = endpoint; } - const runId = process.env.COVERALLS_SERVICE_JOB_ID === '' ? process.env.GITHUB_RUN_ID : process.env.COVERALLS_SERVICE_JOB_ID; + const runId = process.env.COVERALLS_SERVICE_JOB_ID ? process.env.COVERALLS_SERVICE_JOB_ID : process.env.GITHUB_RUN_ID; process.env.COVERALLS_SERVICE_JOB_ID = runId; const carryforward = core.getInput('carryforward');