data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI: Remove vs2019, add ninja and use it for packaging

Browse source
This commit is contained in:
Julien Wadel 2024-09-19 11:49:51 +02:00
parent 5cad3ebfef
commit 12c00cfcbe
1 changed files with 23 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
.gitlab-ci-files/windows-desktop.yml
View file

@ -84,10 +84,6 @@
when: always when: always
expire_in: 1 week expire_in: 1 week
.windows-vs2019:
extends: .windows-vs
tags: [ "windows-powershell-vs-16-2019" ]
.windows-vs2022: .windows-vs2022:
extends: .windows-vs extends: .windows-vs
tags: [ "windows-powershell-vs-17-2022" ] tags: [ "windows-powershell-vs-17-2022" ]
@ -124,24 +120,25 @@
CMAKE_RC_COMPILER : rc.exe CMAKE_RC_COMPILER : rc.exe
extends: .windows-msvc extends: .windows-msvc
vs2019-msvc-win64-windows:
extends:
- .windows-vs2019
- .msvc-win64-windows
vs2022-msvc-win64-windows: vs2022-msvc-win64-windows:
rules: rules:
- !reference [.rules-merge-request-manual, rules] - !reference [.rules-merge-request-manual, rules]
variables:
CMAKE_GENERATOR: "Visual Studio 17 2022"
extends: extends:
- .windows-vs2022 - .windows-vs2022
- .msvc-win64-windows - .msvc-win64-windows
###################################################### ninja-msvc-win64-windows:
rules:
# .windows-vs2019-msvc: - !reference [.rules-merge-request-manual, rules]
# extends: variables:
# - .windows-vs2019 CMAKE_GENERATOR: "Ninja"
# - .windows-msvc CMAKE_ARCHITECTURE: ""
PARALLEL_OPTIONS: ""
extends:
- .windows-vs2022
- .msvc-win64-windows
###################################################### ######################################################
# NIGHTLY # NIGHTLY
@ -156,14 +153,9 @@ vs2022-msvc-win64-windows:
- if: $DEPLOY_PLUGINS - if: $DEPLOY_PLUGINS
- if: $DEPLOY_RUN_WINDOWS - if: $DEPLOY_RUN_WINDOWS
vs2019-win64-scheduled-windows: ninja-win64-scheduled-windows:
extends: extends:
- vs2019-msvc-win64-windows - ninja-msvc-win64-windows
- .vs-scheduled-windows
vs2022-win64-scheduled-windows:
extends:
- vs2022-msvc-win64-windows
- .vs-scheduled-windows - .vs-scheduled-windows
################################################# #################################################
@ -185,13 +177,11 @@ vs2022-win64-scheduled-windows:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_WINDOWS_SIGN_TOOL=$WINDOWS_SIGN_TOOL -DLINPHONE_WINDOWS_SIGN_TIMESTAMP_URL=$WINDOWS_SIGN_TIMESTAMP_URL -DLINPHONE_WINDOWS_SIGN_HASH=$WINDOWS_SIGN_HASH -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_WINDOWS_SIGN_TOOL=$WINDOWS_SIGN_TOOL -DLINPHONE_WINDOWS_SIGN_TIMESTAMP_URL=$WINDOWS_SIGN_TIMESTAMP_URL -DLINPHONE_WINDOWS_SIGN_HASH=$WINDOWS_SIGN_HASH -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON
RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$WINDOWS_PLATFORM/$APP_FOLDER RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$WINDOWS_PLATFORM/$APP_FOLDER
vs2019-win64-package: ninja-win64-package:
extends: variables:
- .windows-msvc CMAKE_GENERATOR: "Ninja"
- .vs-win64-package CMAKE_ARCHITECTURE: ""
- .windows-vs2019 PARALLEL_OPTIONS: ""
vs2022-win64-package:
extends: extends:
- .windows-msvc - .windows-msvc
- .vs-win64-package - .vs-win64-package
@ -213,17 +203,11 @@ vs2022-win64-package:
- if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_INTERNAL_PATH}/${WINDOWS_PLATFORM}/ } - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_INTERNAL_PATH}/${WINDOWS_PLATFORM}/ }
# - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ } # - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
vs2019-win64-upload: ninja-win64-upload:
extends: extends:
- .win64-upload - .win64-upload
needs: needs:
- vs2019-win64-package - ninja-win64-package
vs2022-win64-upload:
extends:
- .win64-upload
needs:
- vs2022-win64-package
.win64-plugins-upload: .win64-plugins-upload:
stage: deploy stage: deploy
@ -233,13 +217,7 @@ vs2022-win64-upload:
script: script:
- scp "build-desktop/OUTPUT/plugins/app/*.dll" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_INTERNAL_DIRECTORY%/plugins" - scp "build-desktop/OUTPUT/plugins/app/*.dll" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_INTERNAL_DIRECTORY%/plugins"
ninja-win64-plugins-upload:
vs2019-win64-plugins-upload:
extends: .win64-plugins-upload extends: .win64-plugins-upload
needs: needs:
- vs2019-win64-scheduled-windows - ninja-win64-scheduled-windows
vs2022-win64-plugins-upload:
extends: .win64-plugins-upload
needs:
- vs2022-win64-scheduled-windows