flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-12 23:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Limit symbol file uploading to develop and release branches

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-02-18 09:55:51 +01:00
committed by Mat Sutcliffe
parent 20131d0b8e
commit 5ea8b7376e
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Jenkinsfile vendored
View File

@@ -18,7 +18,7 @@ builders['Build swift Linux'] = {
'BITROCK_CUSTOMIZE=/opt/installbuilder/autoupdate/bin/customize.run']) { 'BITROCK_CUSTOMIZE=/opt/installbuilder/autoupdate/bin/customize.run']) {
sh """ sh """
cp ~/vatsim.json . cp ~/vatsim.json .
python3 -u scripts/jenkins.py -w 64 -t gcc -d -j 2 -e ${getEolInMonth()} -q SWIFT_CONFIG_JSON+=vatsim.json python3 -u scripts/jenkins.py -w 64 -t gcc -d -j 2 -e ${getEolInMonth()} ${shouldUploadSymbols()} -q SWIFT_CONFIG_JSON+=vatsim.json
""" """
} }
@@ -73,7 +73,7 @@ builders['Build swift MacOS'] = {
'BITROCK_CUSTOMIZE=/Applications/BitRockInstallBuilderQt/autoupdate/bin/customize.sh']) { 'BITROCK_CUSTOMIZE=/Applications/BitRockInstallBuilderQt/autoupdate/bin/customize.sh']) {
sh """ sh """
cp ~/vatsim.json . cp ~/vatsim.json .
python -u scripts/jenkins.py -w 64 -t clang -d -j2 -e ${getEolInMonth()} -q SWIFT_CONFIG_JSON+=vatsim.json python -u scripts/jenkins.py -w 64 -t clang -d -j2 -e ${getEolInMonth()} ${shouldUploadSymbols()} -q SWIFT_CONFIG_JSON+=vatsim.json
""" """
} }
@@ -118,7 +118,7 @@ builders['Build swift Win32'] = {
stage('Win32 Build') { stage('Win32 Build') {
bat """ bat """
copy c:\\var\\vatsim.json . copy c:\\var\\vatsim.json .
python -u scripts/jenkins.py -w 32 -t msvc -d -e ${getEolInMonth()} -q SWIFT_CONFIG_JSON+=vatsim.json python -u scripts/jenkins.py -w 32 -t msvc -d -e ${getEolInMonth()} ${shouldUploadSymbols()} -q SWIFT_CONFIG_JSON+=vatsim.json
""" """
warnings consoleParsers: [[parserName: 'MSBuild']], unstableTotalAll: '0' warnings consoleParsers: [[parserName: 'MSBuild']], unstableTotalAll: '0'
@@ -163,7 +163,7 @@ builders['Build swift Win64'] = {
stage('Win64 Build') { stage('Win64 Build') {
bat """ bat """
copy c:\\var\\vatsim.json . copy c:\\var\\vatsim.json .
python -u scripts/jenkins.py -w 64 -t msvc -d -e ${getEolInMonth()} -q SWIFT_CONFIG_JSON+=vatsim.json python -u scripts/jenkins.py -w 64 -t msvc -d -e ${getEolInMonth()} ${shouldUploadSymbols()} -q SWIFT_CONFIG_JSON+=vatsim.json
""" """
warnings consoleParsers: [[parserName: 'MSBuild']], unstableTotalAll: '0' warnings consoleParsers: [[parserName: 'MSBuild']], unstableTotalAll: '0'
@@ -398,6 +398,18 @@ def getEolInMonth() {
} }
} }
def shouldUploadSymbols() {
def regexDevBranch = /develop\/\d+\.\d+\.\d+/
def regexReleaseBranch = /release\/\d+\.\d+/
if (env.BRANCH_NAME && env.BRANCH_NAME ==~ regexDevBranch) {
return '-u'
} else if (env.BRANCH_NAME && env.BRANCH_NAME ==~ regexReleaseBranch) {
return '-u'
} else {
return ''
}
}
def killDBusDaemon() { def killDBusDaemon() {
bat ''' bat '''
tasklist /FI "IMAGENAME eq dbus-daemon.exe" 2>NUL | find /I /N "dbus-daemon.exe">NUL tasklist /FI "IMAGENAME eq dbus-daemon.exe" 2>NUL | find /I /N "dbus-daemon.exe">NUL

2
scripts/jenkins.py
View File

@@ -378,7 +378,7 @@ def main(argv):
tool_chain = '' tool_chain = ''
dev_build = False dev_build = False
jobs = None jobs = None
upload_symbols = True upload_symbols = False
eolInMonth = 0 eolInMonth = 0
qmake_args = [] qmake_args = []