New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: use buildVersion
not buildNumber
for fpm --iteration
flag
#7075
Changes from 4 commits
6a6c748
e7b3301
0da0e9f
6c28c0b
2ea46e4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,9 +129,15 @@ export interface Configuration extends PlatformSpecificBuildOptions { | |
*/ | ||
readonly npmRebuild?: boolean | ||
|
||
/** | ||
* The build number. Maps to the `--iteration` flag for builds using FPM on Linux. | ||
* If not defined then will fallback to `BUILD_NUMBER` or `TRAVIS_BUILD_NUMBER` or `APPVEYOR_BUILD_NUMBER` or `CIRCLE_BUILD_NUM` or `BUILD_BUILDNUMBER` or `CI_PIPELINE_IID` env. | ||
*/ | ||
readonly buildNumber?: string | null | ||
|
||
/** | ||
* 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` or `CI_PIPELINE_IID` env defined, it will be used as a build version (`version.build_number`). | ||
* If `buildVersion` is not defined and `buildNumber` (or one of the `buildNumber envs) is defined, it will be used as a build version (`version.buildNumber`). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "`buildNumber envs" is missing a closing backtick around buildNumber You'll need to re-run |
||
*/ | ||
readonly buildVersion?: string | null | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -180,10 +180,17 @@ export default class FpmTarget extends Target { | |
} | ||
} | ||
|
||
use(packager.info.metadata.license, it => args.push("--license", it!)) | ||
use(appInfo.buildNumber, it => args.push("--iteration", it!)) | ||
|
||
use(options.fpm, it => args.push(...(it as any))) | ||
use(packager.info.metadata.license, it => args.push("--license", it)) | ||
use(appInfo.buildNumber, it => | ||
args.push( | ||
"--iteration", | ||
// dashes are not supported for iteration in older versions of fpm | ||
// https://github.com/jordansissel/fpm/issues/1833 | ||
it.split("-").join("_") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Change to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
) | ||
) | ||
|
||
use(options.fpm, it => args.push(...it)) | ||
|
||
args.push(`${appOutDir}/=${installPrefix}/${appInfo.sanitizedProductName}`) | ||
for (const icon of await this.helper.icons) { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor grammar change (comma + 'it'): "If not defined, then it will fallback"
Thanks for also specifying its relationship to
--iteration