From 09726952278c9977f81a530a10e9f87dcbfcc756 Mon Sep 17 00:00:00 2001 From: Joakim Reinert Date: Thu, 9 May 2019 18:25:13 +0200 Subject: [PATCH] feat: add support for gitlab ci pipeline ids as buildNumber (#3838) uses the CI_PIPELINE_IID (no typo, this is the project scoped id of the currently running pipeline) --- packages/app-builder-lib/src/appInfo.ts | 4 ++-- packages/app-builder-lib/src/configuration.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app-builder-lib/src/appInfo.ts b/packages/app-builder-lib/src/appInfo.ts index 315bb87c27b..36e01f7a531 100644 --- a/packages/app-builder-lib/src/appInfo.ts +++ b/packages/app-builder-lib/src/appInfo.ts @@ -22,7 +22,7 @@ export class AppInfo { buildVersion = info.config.buildVersion } - this.buildNumber = process.env.BUILD_NUMBER || process.env.TRAVIS_BUILD_NUMBER || process.env.APPVEYOR_BUILD_NUMBER || process.env.CIRCLE_BUILD_NUM || process.env.BUILD_BUILDNUMBER + this.buildNumber = process.env.BUILD_NUMBER || process.env.TRAVIS_BUILD_NUMBER || process.env.APPVEYOR_BUILD_NUMBER || process.env.CIRCLE_BUILD_NUM || process.env.BUILD_BUILDNUMBER || process.env.CI_PIPELINE_IID if (buildVersion == null) { buildVersion = this.version if (!isEmptyOrSpaces(this.buildNumber)) { @@ -144,4 +144,4 @@ export function smarten(s: string): string { // closing doubles s = s.replace(/"/g, "\u201d") return s -} \ No newline at end of file +} diff --git a/packages/app-builder-lib/src/configuration.ts b/packages/app-builder-lib/src/configuration.ts index 75b53f25694..9db65ad3bb6 100644 --- a/packages/app-builder-lib/src/configuration.ts +++ b/packages/app-builder-lib/src/configuration.ts @@ -120,7 +120,7 @@ export interface Configuration extends PlatformSpecificBuildOptions { /** * The build version. Maps to the `CFBundleVersion` on macOS, and `FileVersion` metadata property on Windows. Defaults to the `version`. - * If `TRAVIS_BUILD_NUMBER` or `APPVEYOR_BUILD_NUMBER` or `CIRCLE_BUILD_NUM` or `BUILD_NUMBER` or `bamboo.buildNumber` env defined, it will be used as a build version (`version.build_number`). + * If `TRAVIS_BUILD_NUMBER` or `APPVEYOR_BUILD_NUMBER` or `CIRCLE_BUILD_NUM` or `BUILD_NUMBER` or `bamboo.buildNumber` or `CI_PIPELINE_IID` env defined, it will be used as a build version (`version.build_number`). */ readonly buildVersion?: string | null @@ -270,4 +270,4 @@ export interface MetadataDirectories { * The application directory (containing the application package.json), defaults to `app`, `www` or working directory. */ readonly app?: string | null -} \ No newline at end of file +}