raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'appveyor-release' into 'master'

Browse Source 
Try to fix and force release build

See merge request openlp/openlp!280
This commit is contained in:
Tomas Groth 2020-12-22 07:19:38 +00:00
commit 30c410ab83
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
appveyor.yml
View File

@ -48,7 +48,7 @@ test_script:
after_test: after_test:
# Only package on the master repo # Only package on the master repo
- ps: >- - ps: >-
If (($env:APPVEYOR_REPO_TAG) -Or ($env:APPVEYOR_SCHEDULED_BUILD) -Or ($env:FORCE_PACKAGING -eq 1)) { If (($env:APPVEYOR_REPO_TAG -eq $True) -Or ($env:APPVEYOR_SCHEDULED_BUILD -eq $True) -Or ($env:FORCE_PACKAGING -eq 1)) {
# Continue on error # Continue on error
$ErrorActionPreference = "Continue" $ErrorActionPreference = "Continue"
# This is where we create a package using PyInstaller # This is where we create a package using PyInstaller
@ -92,15 +92,17 @@ after_test:
# If this is a release build, set release argument # If this is a release build, set release argument
$releaseArg = "" $releaseArg = ""
If ($env:APPVEYOR_REPO_TAG -eq $True) { If ($env:APPVEYOR_REPO_TAG -eq $True) {
$releaseArg = "--release $env:APPVEYOR_REPO_TAG_NAME" $releaseArg = "--release ""$env:APPVEYOR_REPO_TAG_NAME"""
} }
cd packaging-master cd packaging-master
If ($isWindows) { If ($isWindows) {
python builders/windows-builder.py $releaseArg --skip-update -c windows/config-appveyor.ini -b "$env:APPVEYOR_BUILD_FOLDER" -d ../documentation-master --portable $cmd = "python builders/windows-builder.py $releaseArg --skip-update -c windows/config-appveyor.ini -b ""$env:APPVEYOR_BUILD_FOLDER"" -d ../documentation-master --portable"
iex $cmd
} else { } else {
# Install qt to get the lrelease tool # Install qt to get the lrelease tool
brew install qt brew install qt
python builders/macosx-builder.py $releaseArg --skip-update -c osx/config-appveyor.ini -b "$env:APPVEYOR_BUILD_FOLDER" -d ../documentation-master $cmd = "python builders/macosx-builder.py $releaseArg --skip-update -c osx/config-appveyor.ini -b ""$env:APPVEYOR_BUILD_FOLDER"" -d ../documentation-master"
iex $cmd
} }
} else { } else {
cd packaging-master cd packaging-master