1.15.0
This commit is contained in:
parent
211f052f3b
commit
ef827fd240
|
@ -69,17 +69,17 @@ on:
|
||||||
- '**/COPYING'
|
- '**/COPYING'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
qt_version: 5.15.14
|
qt_version: 5.15.15
|
||||||
qt6_version: 6.3.1
|
qt6_version: 6.3.1
|
||||||
openssl_version: 3.3.1
|
openssl_version: 3.3.2
|
||||||
ghSsl_user: xanasoft
|
ghSsl_user: xanasoft
|
||||||
ghSsl_repo: openssl-builds
|
ghSsl_repo: openssl-builds
|
||||||
#ghQt6Win7_user: DavidXanatos
|
#ghQt6Win7_user: DavidXanatos
|
||||||
#ghQt6Win7_repo: qtbase
|
#ghQt6Win7_repo: qtbase
|
||||||
ghQtBuilds_user: xanasoft
|
ghQtBuilds_user: xanasoft
|
||||||
ghQtBuilds_repo: qt-builds
|
ghQtBuilds_repo: qt-builds
|
||||||
ghQtBuilds_hash_x86: bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db
|
ghQtBuilds_hash_x86: 0dc0048be815eeaa76bcdd2d02e7028d21cc75fd7f4fb65445d3adf37b4a75bb
|
||||||
ghQtBuilds_hash_x64: 30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898
|
ghQtBuilds_hash_x64: bae6773292ad187aad946854766344c4bd24245359404636b3a1b13d9ae6a97e
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Build_x64:
|
Build_x64:
|
||||||
|
@ -88,7 +88,7 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4.1.5
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Setup msbuild
|
- name: Setup msbuild
|
||||||
uses: microsoft/setup-msbuild@v2
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
@ -166,7 +166,7 @@ jobs:
|
||||||
|
|
||||||
- name: Upload installer assets
|
- name: Upload installer assets
|
||||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||||
uses: actions/upload-artifact@v4.4.3
|
uses: actions/upload-artifact@v4.4.0
|
||||||
with:
|
with:
|
||||||
name: Assets
|
name: Assets
|
||||||
path: |
|
path: |
|
||||||
|
@ -175,7 +175,7 @@ jobs:
|
||||||
|
|
||||||
- name: Upload Sandboxie x64
|
- name: Upload Sandboxie x64
|
||||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||||
uses: actions/upload-artifact@v4.4.3
|
uses: actions/upload-artifact@v4.4.0
|
||||||
with:
|
with:
|
||||||
name: Sandboxie_x64
|
name: Sandboxie_x64
|
||||||
path: |
|
path: |
|
||||||
|
@ -189,7 +189,7 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4.1.5
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Setup msbuild
|
- name: Setup msbuild
|
||||||
uses: microsoft/setup-msbuild@v2
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
@ -269,7 +269,7 @@ jobs:
|
||||||
|
|
||||||
- name: Upload Sandboxie ARM64
|
- name: Upload Sandboxie ARM64
|
||||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||||
uses: actions/upload-artifact@v4.4.3
|
uses: actions/upload-artifact@v4.4.0
|
||||||
with:
|
with:
|
||||||
name: Sandboxie_ARM64
|
name: Sandboxie_ARM64
|
||||||
path: |
|
path: |
|
||||||
|
@ -283,7 +283,7 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4.1.5
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Setup msbuild
|
- name: Setup msbuild
|
||||||
uses: microsoft/setup-msbuild@v2
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
@ -338,7 +338,7 @@ jobs:
|
||||||
|
|
||||||
- name: Upload Sandboxie x86
|
- name: Upload Sandboxie x86
|
||||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||||
uses: actions/upload-artifact@v4.4.3
|
uses: actions/upload-artifact@v4.4.0
|
||||||
with:
|
with:
|
||||||
name: Sandboxie_x86
|
name: Sandboxie_x86
|
||||||
path: |
|
path: |
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
echo %*
|
echo %*
|
||||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||||
|
|
||||||
if %1 == x64 if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\
|
if %1 == x64 if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\
|
||||||
if %1 == Win32 if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019\bin\
|
if %1 == Win32 if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019\bin\
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
echo %*
|
echo %*
|
||||||
IF "%~3" == "" ( set "ghSsl_repo=openssl-builds" ) ELSE ( set "ghSsl_repo=%~3" )
|
IF "%~3" == "" ( set "ghSsl_repo=openssl-builds" ) ELSE ( set "ghSsl_repo=%~3" )
|
||||||
IF "%~2" == "" ( set "ghSsl_user=xanasoft" ) ELSE ( set "ghSsl_user=%~2" )
|
IF "%~2" == "" ( set "ghSsl_user=xanasoft" ) ELSE ( set "ghSsl_user=%~2" )
|
||||||
IF "%~1" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~1" )
|
IF "%~1" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~1" )
|
||||||
|
|
||||||
set "openssl_version_underscore=%openssl_version:.=_%"
|
set "openssl_version_underscore=%openssl_version:.=_%"
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
echo %*
|
echo %*
|
||||||
IF "%~7" == "" ( set "ghQtBuilds_hash_x64=30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
|
IF "%~7" == "" ( set "ghQtBuilds_hash_x64=bae6773292ad187aad946854766344c4bd24245359404636b3a1b13d9ae6a97e" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
|
||||||
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" )
|
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=0dc0048be815eeaa76bcdd2d02e7028d21cc75fd7f4fb65445d3adf37b4a75bb" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" )
|
||||||
IF "%~5" == "" ( set "ghQtBuilds_repo=qt-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" )
|
IF "%~5" == "" ( set "ghQtBuilds_repo=qt-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" )
|
||||||
IF "%~4" == "" ( set "ghQtBuilds_user=xanasoft" ) ELSE ( set "ghQtBuilds_user=%~4" )
|
IF "%~4" == "" ( set "ghQtBuilds_user=xanasoft" ) ELSE ( set "ghQtBuilds_user=%~4" )
|
||||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||||
|
|
||||||
if %1 == Win32 (
|
if %1 == Win32 (
|
||||||
if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done
|
if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done
|
||||||
|
|
|
@ -7,7 +7,7 @@ REM echo qt6_version: %3
|
||||||
|
|
||||||
echo %*
|
echo %*
|
||||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||||
|
|
||||||
IF %1 == Win32 (
|
IF %1 == Win32 (
|
||||||
set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019
|
set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019
|
||||||
|
|
Loading…
Reference in New Issue