Fix preparing to deploy an installer.
This commit is contained in:
parent
c26d913ab6
commit
4060160f87
44
appveyor.yml
44
appveyor.yml
|
@ -62,6 +62,28 @@ environment:
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
RUN_TESTS: true
|
RUN_TESTS: true
|
||||||
|
|
||||||
|
- job_name: Windows_Qt_5_15_(qbs_GCC_x86)
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||||
|
COMPILER: mingw
|
||||||
|
COMPILER_CPPSTD: gnu17
|
||||||
|
COMPILER_LIBCXX: libstdc++11
|
||||||
|
QT: Qt\5.15\mingw81_32
|
||||||
|
QT_VERSION: Qt5_15
|
||||||
|
BUILD_SYSTEM: "qbs"
|
||||||
|
QMAKE: qmake.exe
|
||||||
|
ENABLE_PCH: true
|
||||||
|
GCC_VERSION: 8.1
|
||||||
|
MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
|
||||||
|
ARCH: x86
|
||||||
|
PYTHON: "C:\\Python311"
|
||||||
|
PLATFORM: "Windows7+"
|
||||||
|
CHOCOLATEY_PACKAGES: false
|
||||||
|
WINDEPLOYQT_BIN_PATH: "undefined"
|
||||||
|
WINDEPLOYQT_COMPILER_RUNTIME: "true"
|
||||||
|
WINDEPLOYQT_NO_COMPILER_RUNTIME: "false"
|
||||||
|
DEPLOY: true
|
||||||
|
RUN_TESTS: true
|
||||||
|
|
||||||
# - job_name: Windows_Qt_6_5_(GCC_x64)
|
# - job_name: Windows_Qt_6_5_(GCC_x64)
|
||||||
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
|
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
|
||||||
# COMPILER: mingw
|
# COMPILER: mingw
|
||||||
|
@ -137,28 +159,6 @@ environment:
|
||||||
MULTI_BUNDLE: false
|
MULTI_BUNDLE: false
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
|
|
||||||
- job_name: Windows_Qt_5_15_(qbs_GCC_x86)
|
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
|
||||||
COMPILER: mingw
|
|
||||||
COMPILER_CPPSTD: gnu17
|
|
||||||
COMPILER_LIBCXX: libstdc++11
|
|
||||||
QT: Qt\5.15\mingw81_32
|
|
||||||
QT_VERSION: Qt5_15
|
|
||||||
BUILD_SYSTEM: "qbs"
|
|
||||||
QMAKE: qmake.exe
|
|
||||||
ENABLE_PCH: true
|
|
||||||
GCC_VERSION: 8.1
|
|
||||||
MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
|
|
||||||
ARCH: x86
|
|
||||||
PYTHON: "C:\\Python311"
|
|
||||||
PLATFORM: "Windows7+"
|
|
||||||
CHOCOLATEY_PACKAGES: false
|
|
||||||
WINDEPLOYQT_BIN_PATH: "undefined"
|
|
||||||
WINDEPLOYQT_COMPILER_RUNTIME: "true"
|
|
||||||
WINDEPLOYQT_NO_COMPILER_RUNTIME: "false"
|
|
||||||
DEPLOY: true
|
|
||||||
RUN_TESTS: true
|
|
||||||
|
|
||||||
- job_name: Windows_Qt_5_15_(make_GCC_x86)
|
- job_name: Windows_Qt_5_15_(make_GCC_x86)
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||||
COMPILER: mingw
|
COMPILER: mingw
|
||||||
|
|
2
dist/win/inno/valentina.iss
vendored
2
dist/win/inno/valentina.iss
vendored
|
@ -236,7 +236,7 @@ Source: "{#buildDirectory}\networkinformation\*"; DestDir: "{app}\networkinforma
|
||||||
Source: "{#buildDirectory}\platforms\*"; DestDir: "{app}\platforms"; Flags: recursesubdirs createallsubdirs
|
Source: "{#buildDirectory}\platforms\*"; DestDir: "{app}\platforms"; Flags: recursesubdirs createallsubdirs
|
||||||
Source: "{#buildDirectory}\styles\*"; DestDir: "{app}\styles"; Flags: recursesubdirs createallsubdirs
|
Source: "{#buildDirectory}\styles\*"; DestDir: "{app}\styles"; Flags: recursesubdirs createallsubdirs
|
||||||
Source: "{#buildDirectory}\svgfonts\*"; DestDir: "{app}\svgfonts"; Flags: recursesubdirs createallsubdirs
|
Source: "{#buildDirectory}\svgfonts\*"; DestDir: "{app}\svgfonts"; Flags: recursesubdirs createallsubdirs
|
||||||
Source: "{#buildDirectory}\tls\*"; DestDir: "{app}\tls"; Flags: recursesubdirs createallsubdirs
|
Source: "{#buildDirectory}\tls\*"; DestDir: "{app}\tls"; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
|
||||||
Source: "{#buildDirectory}\printsupport\*"; DestDir: "{app}\printsupport"; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
|
Source: "{#buildDirectory}\printsupport\*"; DestDir: "{app}\printsupport"; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
|
||||||
Source: "{#buildDirectory}\*.exe"; DestDir: "{app}"; Flags: ignoreversion
|
Source: "{#buildDirectory}\*.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
Source: "{#buildDirectory}\*.dll"; DestDir: "{app}"
|
Source: "{#buildDirectory}\*.dll"; DestDir: "{app}"
|
||||||
|
|
|
@ -6,7 +6,7 @@ $file_name = "valentina-$env:PLATFORM-$env:COMPILER-$env:ARCH-$env:QT_VERSION-$e
|
||||||
if($env:DEPLOY -eq "true") {
|
if($env:DEPLOY -eq "true") {
|
||||||
Write-Host "[CI] Preparing installer." -ForegroundColor Green;
|
Write-Host "[CI] Preparing installer." -ForegroundColor Green;
|
||||||
Rename-Item -Path "$env:INSTALL_ROOT\valentina\ValentinaInstaller.exe" -NewName "$file_name";
|
Rename-Item -Path "$env:INSTALL_ROOT\valentina\ValentinaInstaller.exe" -NewName "$file_name";
|
||||||
if ($LastExitCode -ne 0) {
|
if ($?) {
|
||||||
Write-Error -Message "[CI] Error preparing installer." -Category InvalidResult;
|
Write-Error -Message "[CI] Error preparing installer." -Category InvalidResult;
|
||||||
exit 1;
|
exit 1;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user