A free open source IT asset/license management system
Update version
snipeae790bb060cb
diff --git a/app/Console/Commands/Version.php b/app/Console/Commands/Version.phpindex 6bf5f94344..6d9cf70617 100644--- a/app/Console/Commands/Version.php+++ b/app/Console/Commands/Version.php@@ -126,8 +126,13 @@ class Version extends Command\File::put($versionFile, $content);info('New version: '.$full_app_version.' ('.$git_branch.')');- info('Building JS/CSS assets...');- passthru('npm run prod', $exitCode);+ // Master ships production-minified assets; develop / topic+ // branches ship the dev-build artifacts so partial merges+ // don't drop into master with mismatched compiled JS/CSS.+ $npmScript = $use_branch === 'master' ? 'npm run prod' : 'npm run dev';++ info('Building JS/CSS assets ('.$npmScript.')...');+ passthru($npmScript, $exitCode);if ($exitCode !== 0) {$this->error('Asset build failed with exit code '.$exitCode);diff --git a/config/version.php b/config/version.phpindex 82ef5df173..a0d8f20436 100644--- a/config/version.php+++ b/config/version.php@@ -1,11 +1,11 @@<?phpreturn [- 'app_version' => 'v8.7.0-pre',- 'full_app_version' => 'v8.7.0-pre - build 23531-gf80167fe1b',- 'build_version' => '23531',+ 'app_version' => 'v8.7.0',+ 'full_app_version' => 'v8.7.3-pre - build 24424-gd3be770f25',+ 'build_version' => '24424','prerelease_version' => '',- 'hash_version' => 'gf80167fe1b',- 'full_hash' => 'v8.7.0-pre-386-gf80167fe1b',- 'branch' => 'master',+ 'hash_version' => 'gd3be770f25',+ 'full_hash' => 'v8.7.0-1179-gd3be770f25',+ 'branch' => 'develop',];