Merge branch 'master' into undo

This commit is contained in:
Leonardo Zide
2026-03-07 17:40:26 -08:00
+7 -7
View File
@@ -3,7 +3,7 @@ skip_tags: true
image:
- Ubuntu1604
- macOS
- Visual Studio 2019
- Visual Studio 2022
configuration: Release
platform: x64
@@ -18,11 +18,11 @@ for:
-
matrix:
only:
- image: Visual Studio 2019
- image: Visual Studio 2022
before_build:
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
- set PATH=C:\Qt\5.15\msvc2019_64\bin;%PATH%
- call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
- set PATH=C:\Qt\6.9\msvc2022_64\bin;%PATH%
- git rev-parse --short HEAD > version.txt
- set /p VERSION= < version.txt
- qmake -v
@@ -37,7 +37,7 @@ for:
- mkdir appdir
- copy build\release\leocad.exe appdir
- copy docs\readme.md appdir\readme.txt
- appveyor DownloadFile https://github.com/leozide/leocad/releases/download/v23.03/Library-25.08.zip -FileName library.zip
- appveyor DownloadFile https://github.com/leozide/leocad/releases/download/v25.09/Library-25.08.zip -FileName library.zip
- 7z e library.zip
- copy library.bin appdir\\library.bin
- appveyor DownloadFile https://github.com/leozide/povray/releases/download/continuous/povconsole32-sse2.exe -FileName appdir\povconsole32-sse2.exe
@@ -79,7 +79,7 @@ for:
after_build:
- make install INSTALL_ROOT=AppDir
- appveyor DownloadFile https://github.com/leozide/leocad/releases/download/v23.03/Library-25.08.zip -FileName library.zip
- appveyor DownloadFile https://github.com/leozide/leocad/releases/download/v25.09/Library-25.08.zip -FileName library.zip
- unzip library.zip
- mkdir -p AppDir/usr/share/leocad
- mv library.bin AppDir/usr/share/leocad/library.bin
@@ -119,7 +119,7 @@ for:
- export TRAVIS_COMMIT=$APPVEYOR_REPO_COMMIT
- appveyor DownloadFile https://github.com/leozide/povray/releases/download/continuous/povray
- chmod +x povray
- appveyor DownloadFile https://github.com/leozide/leocad/releases/download/v23.03/Library-25.08.zip -FileName library.zip
- appveyor DownloadFile https://github.com/leozide/leocad/releases/download/v25.09/Library-25.08.zip -FileName library.zip
- unzip library.zip
build_script: