Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-desktop
Commits
7da4977f
Commit
7da4977f
authored
5 months ago
by
Julien Wadel
Browse files
Options
Download
Patches
Plain Diff
Fix CI for upload and RELEASE file
parent
49877786
master
build/windows_runner_ok
feature/AEC3
feature/dp
feature/loading_spinner
feature/oidc_client_secret
feature/redirect_uri
feature/test_integ_sdk
feature/translation
fix/LINQT-1362
fix/LINQT-1482
fix/SLS-8
fix/all
fix/auth_popup
fix/conference_index_as_objects
fix/config_login_page
fix/contact_list
fix/contact_speed
fix/disable_chat_feature
fix/jira_conseil_dep
fix/login_page_back_button
fix/qt6.8compil
fix/quit_conf_screensharing
fix/set_operator
fix/slow_ldap_loading
fix/ui
fix/ui_fixes
1 merge request
!1054
Fix CI for upload and RELEASE file
Pipeline
#83639
failed with stages
in 69 minutes and 59 seconds
Changes
5
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
+2
-2
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
.gitlab-ci-files/macosx-desktop.yml
+3
-2
.gitlab-ci-files/macosx-desktop.yml
.gitlab-ci-files/windows-desktop.yml
+2
-2
.gitlab-ci-files/windows-desktop.yml
CMakeLists.txt
+1
-1
CMakeLists.txt
cmake/install/install.cmake
+3
-0
cmake/install/install.cmake
with
11 additions
and
7 deletions
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
+
2
−
2
View file @
7da4977f
...
...
@@ -149,7 +149,7 @@ ubuntu2004-makefile-gcc-deploy:
-
$NIGHTLY_MASTER
-
$DEPLOY_LINUX
script
:
-
rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $
MAIN_
DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER
-
rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER
-
|-
if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then
rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM
...
...
@@ -166,5 +166,5 @@ ubuntu2004-makefile-gcc-plugins-deploy:
variables
:
-
$DEPLOY_PLUGINS
script
:
-
rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $
MAIN_
DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/
-
rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/
This diff is collapsed.
Click to expand it.
.gitlab-ci-files/macosx-desktop.yml
+
3
−
2
View file @
7da4977f
...
...
@@ -148,9 +148,10 @@ macosx-makefile-deploy:
-
$NIGHTLY_MASTER
-
$DEPLOY_MACOSX
script
:
-
rsync -rlv --ignore-existing build/OUTPUT/Linphone*/macos/Packages/Linphone*.dmg $
MAIN_
DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER
-
rsync -rlv --ignore-existing build/OUTPUT/Linphone*/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
...
...
@@ -164,5 +165,5 @@ macosx-makefile-plugins-deploy:
variables
:
-
$DEPLOY_PLUGINS
script
:
-
rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.dylib $
MAIN_
DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER/plugins
-
rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.dylib $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER/plugins
This diff is collapsed.
Click to expand it.
.gitlab-ci-files/windows-desktop.yml
+
2
−
2
View file @
7da4977f
...
...
@@ -204,8 +204,8 @@ win64-ninja-vs2022-package-windows:
-
if
:
$DEPLOY_WINDOWS
script
:
-
scp -pr build-desktop/OUTPUT/Packages/*.exe ${
MAIN_
DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/${APP_FOLDER}
#
- if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_
INTERNAL_
PATH}/${WINDOWS_PLATFORM}/ }
-
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}/ }
win64-ninja-vs2022-upload
:
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
7da4977f
...
...
@@ -173,7 +173,7 @@ add_option(OPTION_LIST ENABLE_UPDATE_CHECK "Enable update check." ON)
add_option
(
OPTION_LIST ENABLE_VIDEO
"Enable Video support."
YES
)
add_option
(
OPTION_LIST ENABLE_WINDOWS_TOOLS_CHECK
"Enable tools checks on Windows for auto install."
OFF
)
add_
option
(
OPTION_LIST LINPHONE_SDK_MAKE_RELEASE_FILE_URL
"Make a RELEASE file that work along check_version and use this URL"
""
)
add_
cache
(
OPTION_LIST LINPHONE_SDK_MAKE_RELEASE_FILE_URL
"Make a RELEASE file that work along check_version and use this URL"
""
)
add_option
(
OPTION_LIST ENABLE_OPENH264
"Enable the use of OpenH264 codec"
${
ENABLE_VIDEO
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake/install/install.cmake
+
3
−
0
View file @
7da4977f
...
...
@@ -293,6 +293,9 @@ if(${ENABLE_APP_PACKAGING})
##############################################
configure_file
(
"
${
CMAKE_SOURCE_DIR
}
/cmake/install/packaging.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/cmake/install/packaging.cmake"
@ONLY
)
install
(
SCRIPT
"
${
CMAKE_BINARY_DIR
}
/cmake/install/packaging.cmake"
)
if
(
LINPHONE_SDK_MAKE_RELEASE_FILE_URL
)
bc_make_release_file
(
"
${
LINPHONEAPP_VERSION
}
"
"
${
LINPHONE_SDK_MAKE_RELEASE_FILE_URL
}
/
${
CPACK_PACKAGE_FILE_NAME
}
.
${
PACKAGE_EXT
}
"
)
endif
()
include
(
CPack
)
endif
()
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets