diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml index 2e4609686..14a01b0e2 100644 --- a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml +++ b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml @@ -139,29 +139,32 @@ ubuntu2004-makefile-gcc-package: # Deploy - Nightly ################################################# -#ubuntu2004-makefile-gcc-deploy: -# stage: deploy -# tags: [ "deploy" ] -# needs: -# - ubuntu2004-makefile-gcc-package -# only: -# variables: -# - $NIGHTLY_MASTER -# - $DEPLOY_LINUX -# script: -# - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER -# - rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM -# - rsync -rlv build/OUTPUT/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM +ubuntu2004-makefile-gcc-deploy: + stage: deploy + tags: [ "deploy" ] + needs: + - ubuntu2004-makefile-gcc-package + only: + variables: + - $NIGHTLY_MASTER + - $DEPLOY_LINUX + script: + - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$LINUX_PLATFORM/$APP_FOLDER + - |- + if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then + rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM + rsync -rlv build/OUTPUT/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM + fi -#ubuntu2004-makefile-gcc-plugins-deploy: -# stage: deploy -# tags: [ "deploy" ] -# needs: -# - ubuntu2004-makefile-gcc -# only: -# variables: -# - $DEPLOY_PLUGINS -# script: -# - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/ +ubuntu2004-makefile-gcc-plugins-deploy: + stage: deploy + tags: [ "deploy" ] + needs: + - ubuntu2004-makefile-gcc + only: + variables: + - $DEPLOY_PLUGINS + script: + - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/ diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 12598f1e3..ffb9be7bd 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -138,32 +138,31 @@ macosx-codesigning: # Deploy - Nightly ################################################# -#macosx-makefile-deploy: -# stage: deploy -# tags: [ "macos-xcode13" ] -# needs: -# - macosx-codesigning -# only: -# variables: -# - $NIGHTLY_MASTER -# - $DEPLOY_MACOSX -# script: -# - rsync -rlv --ignore-existing build/OUTPUT/linphone-app/macos/Packages/Linphone*.dmg $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER -# - |- -# if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then -# rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM -# rsync -rlv build/OUTPUT/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM -# fi +macosx-makefile-deploy: + stage: deploy + tags: [ "macos-xcode13" ] + needs: + - macosx-codesigning + only: + variables: + - $NIGHTLY_MASTER + - $DEPLOY_MACOSX + script: + - rsync -rlv --ignore-existing build/OUTPUT/linphone-app/macos/Packages/Linphone*.dmg $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$MACOSX_PLATFORM/$APP_FOLDER + - |- + if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then + rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$MACOSX_PLATFORM + fi -#macosx-makefile-plugins-deploy: -# stage: deploy -# tags: [ "macos-xcode13" ] -# needs: -# - macosx-makefile -# only: -# variables: -# - $DEPLOY_PLUGINS -# script: -# - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.dylib $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER/plugins +macosx-makefile-plugins-deploy: + stage: deploy + tags: [ "macos-xcode13" ] + needs: + - macosx-makefile + only: + variables: + - $DEPLOY_PLUGINS + script: + - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.dylib $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$MACOSX_PLATFORM/$APP_FOLDER/plugins diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml index c22874945..3b305156c 100644 --- a/.gitlab-ci-files/windows-desktop.yml +++ b/.gitlab-ci-files/windows-desktop.yml @@ -166,28 +166,28 @@ vs2019-win64-package: # DEPLOY ################################################# -#vs2019-win64-upload: -# stage: deploy -# tags: [ "windows-powershell"] -# rules: -# - if: $NIGHTLY_MASTER -# - if: $DEPLOY_WINDOWS -# needs: -# - vs2019-win64-package -# script: -# - scp -pr build-desktop/OUTPUT/Packages/*.exe ${DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/${APP_FOLDER} -# - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${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: + stage: deploy + tags: [ "windows-powershell"] + rules: + - if: $NIGHTLY_MASTER + - if: $DEPLOY_WINDOWS + needs: + - vs2019-win64-package + script: + - scp -pr build-desktop/OUTPUT/Packages/*.exe ${DEPLOY_SERVER}:${UPLOAD_ROOT_INTERNAL_PATH}/${WINDOWS_PLATFORM}/${APP_FOLDER} + - 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}/ } -#vs2019-win64-plugins-upload: -# stage: deploy -# tags: [ "windows"] -# rules: -# - if: $DEPLOY_PLUGINS -# needs: -# - vs2019-win64-scheduled-windows -# script: -# - scp "build-desktop/OUTPUT/plugins/app/*.dll" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_DIRECTORY%/plugins" +vs2019-win64-plugins-upload: + stage: deploy + tags: [ "windows"] + rules: + - if: $DEPLOY_PLUGINS + needs: + - vs2019-win64-scheduled-windows + script: + - scp "build-desktop/OUTPUT/plugins/app/*.dll" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_INTERNAL_DIRECTORY%/plugins"