FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream null version; build version tags not being saved properly #575 (#578)

Browse Source 
* Check for null version from upstream #575

* Fix for pre-release version numbering

* Move popup to right

* Split get/generate build ID #575
This commit is contained in:
Nabeel S
2020-02-23 12:23:19 -05:00
committed by GitHub
parent b9fe8bf738
commit 0e13905098
9 changed files with 89 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/Version.php
View File

@@ -34,7 +34,7 @@ class Version extends Command
// If a version is being passed in, the update the build, etc data against this
if ($this->argument('version')) {
$version = \SemVer\SemVer\Version::fromString($this->argument('version'));
if ($this->option('write_full_version')) {
if ($this->option('write-full-version')) {
$cfg['current']['major'] = $version->getMajor();
$cfg['current']['minor'] = $version->getMinor();
$cfg['current']['patch'] = $version->getPatch();
@@ -51,7 +51,7 @@ class Version extends Command
}
// Always write out the build ID/build number which is the commit hash
$build_number = $this->versionSvc->getBuildId($cfg);
$build_number = $this->versionSvc->generateBuildId($cfg);
$cfg['current']['commit'] = $build_number;
$cfg['build']['number'] = $build_number;