aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename environment variable.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-01-25 12:27:22 +02:00
parent e31bc4c0d4
commit ac92a209d9
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
appveyor.yml
View File

@ -54,7 +54,7 @@ environment:
VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\" VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows10+" TARGET_PLATFORM: "Windows10+"
CHOCOLATEY_PACKAGES: false CHOCOLATEY_PACKAGES: false
WINDEPLOYQT_BIN_PATH: "undefined" WINDEPLOYQT_BIN_PATH: "undefined"
WINDEPLOYQT_COMPILER_RUNTIME: "true" WINDEPLOYQT_COMPILER_RUNTIME: "true"
@ -76,7 +76,7 @@ environment:
MINGW_PATH: C:\Qt\Tools\mingw810_32\bin MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
ARCH: x86 ARCH: x86
PYTHON: "C:\\Python311" PYTHON: "C:\\Python311"
PLATFORM: "Windows7+" TARGET_PLATFORM: "Windows7+"
CHOCOLATEY_PACKAGES: false CHOCOLATEY_PACKAGES: false
WINDEPLOYQT_BIN_PATH: "undefined" WINDEPLOYQT_BIN_PATH: "undefined"
WINDEPLOYQT_COMPILER_RUNTIME: "true" WINDEPLOYQT_COMPILER_RUNTIME: "true"
@ -98,7 +98,7 @@ environment:
# MINGW_PATH: C:\ProgramData\mingw64\mingw64\bin # MINGW_PATH: C:\ProgramData\mingw64\mingw64\bin
# ARCH: x64 # ARCH: x64
# PYTHON: "C:\\Python311-x64" # PYTHON: "C:\\Python311-x64"
# PLATFORM: "Windows10+" # TARGET_PLATFORM: "Windows10+"
# CHOCOLATEY_PACKAGES: true # CHOCOLATEY_PACKAGES: true
# CHOCOLATEY_MINGW_VERSION: 13.2.0 # CHOCOLATEY_MINGW_VERSION: 13.2.0
# WINDEPLOYQT_BIN_PATH: "undefined" # WINDEPLOYQT_BIN_PATH: "undefined"
@ -115,7 +115,7 @@ environment:
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 14.1 XCODE_VERSION: 14.1
PLATFORM: "macOS_10.13+" TARGET_PLATFORM: "macOS_10.13+"
MACOS_DEPLOYMENT_TARGET: 10.13 MACOS_DEPLOYMENT_TARGET: 10.13
MULTI_BUNDLE: true MULTI_BUNDLE: true
DEPLOY: true DEPLOY: true
@ -128,7 +128,7 @@ environment:
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 14.1 XCODE_VERSION: 14.1
PLATFORM: "macOS_10.13+" TARGET_PLATFORM: "macOS_10.13+"
MACOS_DEPLOYMENT_TARGET: 10.13 MACOS_DEPLOYMENT_TARGET: 10.13
MULTI_BUNDLE: false MULTI_BUNDLE: false
DEPLOY: true DEPLOY: true
@ -141,7 +141,7 @@ environment:
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 14.1 XCODE_VERSION: 14.1
PLATFORM: "macOS_11+" TARGET_PLATFORM: "macOS_11+"
MACOS_DEPLOYMENT_TARGET: 11.0 MACOS_DEPLOYMENT_TARGET: 11.0
MULTI_BUNDLE: true MULTI_BUNDLE: true
DEPLOY: true DEPLOY: true
@ -154,7 +154,7 @@ environment:
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 14.1 XCODE_VERSION: 14.1
PLATFORM: "macOS_11+" TARGET_PLATFORM: "macOS_11+"
MACOS_DEPLOYMENT_TARGET: 11.0 MACOS_DEPLOYMENT_TARGET: 11.0
MULTI_BUNDLE: false MULTI_BUNDLE: false
DEPLOY: true DEPLOY: true
@ -168,7 +168,7 @@ environment:
MINGW_PATH: C:\Qt\Tools\mingw810_32\bin MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
ARCH: x86 ARCH: x86
PYTHON: "C:\\Python311" PYTHON: "C:\\Python311"
PLATFORM: "Windows7+" TARGET_PLATFORM: "Windows7+"
DEPLOY: false DEPLOY: false
- job_name: Windows_Qt_5_15_(qbs_GCC_x64) - job_name: Windows_Qt_5_15_(qbs_GCC_x64)
@ -185,7 +185,7 @@ environment:
MINGW_PATH: C:\Qt\Tools\mingw810_64\bin MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows7+" TARGET_PLATFORM: "Windows7+"
CHOCOLATEY_PACKAGES: false CHOCOLATEY_PACKAGES: false
WINDEPLOYQT_BIN_PATH: "undefined" WINDEPLOYQT_BIN_PATH: "undefined"
WINDEPLOYQT_COMPILER_RUNTIME: "true" WINDEPLOYQT_COMPILER_RUNTIME: "true"
@ -205,7 +205,7 @@ environment:
VSVER: 16 VSVER: 16
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows7+" TARGET_PLATFORM: "Windows7+"
CHOCOLATEY_PACKAGES: false CHOCOLATEY_PACKAGES: false
WINDEPLOYQT_BIN_PATH: "undefined" WINDEPLOYQT_BIN_PATH: "undefined"
WINDEPLOYQT_COMPILER_RUNTIME: "true" WINDEPLOYQT_COMPILER_RUNTIME: "true"
@ -222,7 +222,7 @@ environment:
MINGW_PATH: C:\Qt\Tools\mingw810_64\bin MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows7+" TARGET_PLATFORM: "Windows7+"
DEPLOY: false DEPLOY: false
- job_name: Windows_Qt_5_15_(nmake_MSVC_x64) - job_name: Windows_Qt_5_15_(nmake_MSVC_x64)
@ -233,7 +233,7 @@ environment:
VSVER: 16 VSVER: 16
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows7+" TARGET_PLATFORM: "Windows7+"
DEPLOY: false DEPLOY: false
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
@ -244,7 +244,7 @@ environment:
BUILD_SYSTEM: "make" BUILD_SYSTEM: "make"
ARCH: x64 ARCH: x64
XCODE_VERSION: 12.3 XCODE_VERSION: 12.3
PLATFORM: "macOS_10.13+" TARGET_PLATFORM: "macOS_10.13+"
DEPLOY: false DEPLOY: false
matrix: matrix:

2
scripts/appveyor-deploy.ps1
View File

@ -1,7 +1,7 @@
$env:BUILD_FOLDER = "$env:APPVEYOR_BUILD_FOLDER\build"; $env:BUILD_FOLDER = "$env:APPVEYOR_BUILD_FOLDER\build";
$env:INSTALL_ROOT = "$env:BUILD_FOLDER\install-root\valentina"; $env:INSTALL_ROOT = "$env:BUILD_FOLDER\install-root\valentina";
$file_name = "valentina-$env:PLATFORM-$env:COMPILER-$env:ARCH-$env:QT_VERSION-$env:APPVEYOR_REPO_BRANCH-$env:APPVEYOR_REPO_COMMIT.exe"; $file_name = "valentina-$env:TARGET_PLATFORM-$env:COMPILER-$env:ARCH-$env:QT_VERSION-$env:APPVEYOR_REPO_BRANCH-$env:APPVEYOR_REPO_COMMIT.exe";
if($env:DEPLOY -eq "true") { if($env:DEPLOY -eq "true") {
Write-Host "[CI] Preparing installer." -ForegroundColor Green; Write-Host "[CI] Preparing installer." -ForegroundColor Green;

8
scripts/cirrus-deploy.sh
View File

@ -22,9 +22,9 @@ check_failure() {
if [[ "$DEPLOY" == "true" ]]; then if [[ "$DEPLOY" == "true" ]]; then
print_info "Start labeling."; print_info "Start labeling.";
if [[ "$MULTI_BUNDLE" == "false" ]]; then if [[ "$MULTI_BUNDLE" == "false" ]]; then
mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg; mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg;
else else
mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg; mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg;
fi fi
check_failure "Unable to label Valentina DMG."; check_failure "Unable to label Valentina DMG.";
@ -34,9 +34,9 @@ if [[ "$DEPLOY" == "true" ]]; then
print_info "Start uploading."; print_info "Start uploading.";
if [[ "$MULTI_BUNDLE" == "false" ]]; then if [[ "$MULTI_BUNDLE" == "false" ]]; then
python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg"; python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg";
else else
python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg"; python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg";
fi fi
check_failure "Unable to upload Valentina DMG."; check_failure "Unable to upload Valentina DMG.";