Skip to content

Commit

Permalink
Shorten version name (Mudlet#3535)
Browse files Browse the repository at this point in the history
  • Loading branch information
vadi2 authored Mar 28, 2020
1 parent b7d728a commit 3e2f7e2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CI/appveyor.after_success.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ windeployqt.exe --release mudlet.exe

Remove-Item * -include *.cpp, *.o

$Script:PublicTestBuild = if ($Env:MUDLET_VERSION_BUILD) { $Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build') } else { $FALSE }
$Script:PublicTestBuild = if ($Env:MUDLET_VERSION_BUILD) { $Env:MUDLET_VERSION_BUILD.StartsWith('-ptb' } else { $FALSE }

if (Test-Path Env:APPVEYOR_PULL_REQUEST_NUMBER) {
$Script:Commit = git rev-parse --short $Env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT
Expand Down
2 changes: 1 addition & 1 deletion CI/appveyor.set-build-info.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cd $Env:APPVEYOR_BUILD_FOLDER
if ($Env:APPVEYOR_REPO_TAG -eq "false") {
# The only scheduled Appveyor builds are public test builds
if ($Env:APPVEYOR_SCHEDULED_BUILD -eq "True") {
$Env:MUDLET_VERSION_BUILD = "-public-test-build"
$Env:MUDLET_VERSION_BUILD = "-ptb"
} else {
$Env:MUDLET_VERSION_BUILD = "-testing"
}
Expand Down
2 changes: 1 addition & 1 deletion CI/travis.osx.after_success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

if [[ "${MUDLET_VERSION_BUILD}" == -public-test-build* ]]; then
if [[ "${MUDLET_VERSION_BUILD}" == -ptb* ]]; then
public_test_build="true"
fi

Expand Down
2 changes: 1 addition & 1 deletion CI/travis.set-build-info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MUDLET_VERSION_BUILD=""
if [ -z "${TRAVIS_TAG}" ]; then
if [ "$TRAVIS_EVENT_TYPE" = "cron" ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then
# The only scheduled macos builds are public test builds
MUDLET_VERSION_BUILD="-public-test-build"
MUDLET_VERSION_BUILD="-ptb"
else
MUDLET_VERSION_BUILD="-testing"
fi
Expand Down
2 changes: 1 addition & 1 deletion src/mudlet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ QPointer<QMainWindow> mudlet::mpDebugArea = nullptr;
bool mudlet::debugMode = false;

const bool mudlet::scmIsReleaseVersion = QByteArray(APP_BUILD).isEmpty();
const bool mudlet::scmIsPublicTestVersion = QByteArray(APP_BUILD).startsWith("-public-test-build");
const bool mudlet::scmIsPublicTestVersion = QByteArray(APP_BUILD).startsWith("-ptb");
const bool mudlet::scmIsDevelopmentVersion = !mudlet::scmIsReleaseVersion && !mudlet::scmIsPublicTestVersion;

QVariantHash mudlet::mLuaFunctionNames;
Expand Down
2 changes: 1 addition & 1 deletion src/mudlet.pro
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ BUILD = $$(MUDLET_VERSION_BUILD)
isEmpty( BUILD ) {
# Possible values are:
# "-dev" for the development build
# "-public-test-build" for the public test build
# "-ptb" for the public test build
# "" for the release build
BUILD = "-dev"
}
Expand Down

0 comments on commit 3e2f7e2

Please sign in to comment.