From 7c1f5ab9ddcc3a2952916cd77e09b551c9fdf39c Mon Sep 17 00:00:00 2001 From: Jakob Erben Date: Fri, 12 Jan 2024 13:52:21 +0100 Subject: [PATCH 1/2] fix: adapt to new publish pipeline --- src/index.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/index.ts b/src/index.ts index efdfc23..46cbceb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,7 +9,7 @@ import { runTeamsDevelopMessagingCommand } from "./commands/TeamsDevelopMessagin import { runTeamsProductionMessagingCommand } from "./commands/TeamsProductionMessaging"; async function run() { - let buildWasSuccessful = fs.existsSync(`${os.homedir()}/SUCCESS`); + const buildWasSuccessful = fs.existsSync(`${os.homedir()}/SUCCESS`); const webhook = process.env.teams_webhook_url!; const buildId = process.env.CM_BUILD_ID!; @@ -20,11 +20,13 @@ async function run() { let artifactUrl: string; let artifactType: string; + // if no artifact is found, logs are used as a fallback + artifactUrl = buildUrl; + artifactType = "logs"; + if (process.env.CM_ARTIFACT_LINKS !== undefined) { const cmArtifactLinks = JSON.parse(process.env.CM_ARTIFACT_LINKS); - if (cmArtifactLinks.filter((element: any) => element.type === "apk" || element.type === "ipa").length === 0) { - buildWasSuccessful = false; - } else { + if (cmArtifactLinks.filter((element: any) => element.type === "apk" || element.type === "ipa").length !== 0) { const pickedElement = cmArtifactLinks.filter( (element: any) => element.type === "apk" || element.type === "ipa" )[0]; @@ -33,12 +35,6 @@ async function run() { } } - if (!buildWasSuccessful) { - // should link to the workflow-log can be determined from buildId and projectId - artifactUrl = buildUrl; - artifactType = "logs"; - } - await yargs(process.argv.slice(2)) .option("platform", { description: "Identifier of the platform for which the build was created", From 8d5de9fa8dbf560d56c6ffb71f95caa296766a52 Mon Sep 17 00:00:00 2001 From: Jakob Erben Date: Fri, 12 Jan 2024 13:53:21 +0100 Subject: [PATCH 2/2] chore: bump version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e9a7d5c..be081e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@js-soft/codemagic-tools", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@js-soft/codemagic-tools", - "version": "1.0.1", + "version": "1.0.2", "license": "MIT", "dependencies": { "axios": "^1.6.2", diff --git a/package.json b/package.json index 8cf2afd..6a4e33c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@js-soft/codemagic-tools", - "version": "1.0.1", + "version": "1.0.2", "description": "Codemagic extended tooling", "homepage": "https://github.com/js-soft/codemagic-tools#readme", "bugs": {