From 6931c43de703966f1269321a40b05fc3140a4bdd Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Mon, 7 Jan 2019 16:36:24 +0100
Subject: [PATCH] Upload windows and mac package at each build

---
 .gitlab-ci-files/job-linux-centos7.yml |  2 +-
 .gitlab-ci-files/job-macosx.yml        | 13 +++++--------
 .gitlab-ci-files/job-windows.yml       |  7 ++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci-files/job-linux-centos7.yml b/.gitlab-ci-files/job-linux-centos7.yml
index c56c0bf53..cfcb4d6b9 100644
--- a/.gitlab-ci-files/job-linux-centos7.yml
+++ b/.gitlab-ci-files/job-linux-centos7.yml
@@ -67,7 +67,7 @@ job-centos7-rpm:
 job-centos7-rpm-deploy:
 
   stage: deploy
-  tags: [ "deploy" ]
+  tags: [ "deploy-linux" ]
 
   only:
     - schedules
diff --git a/.gitlab-ci-files/job-macosx.yml b/.gitlab-ci-files/job-macosx.yml
index b6eceb251..97c407a70 100644
--- a/.gitlab-ci-files/job-macosx.yml
+++ b/.gitlab-ci-files/job-macosx.yml
@@ -15,7 +15,7 @@
 
   artifacts:
     paths:
-      - WORK/desktop/Build/linphone_package/Linphone-*.dmg
+      - WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*.dmg
       - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip
     when: always
     expire_in: 1 week
@@ -69,7 +69,7 @@ job-macosx-xcode:
 
   artifacts:
     paths:
-      - WORK/desktop/Build/linphone_package/Linphone-*.dmg
+      - WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*.dmg
       - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip
     when: always
     expire_in: 1 week
@@ -78,16 +78,13 @@ job-macosx-xcode:
 # Deploy
 #################################################
 
-job-macosx-xcode-deploy:
+job-macosx-deploy:
 
   stage: deploy
   tags: [ "deploy" ]
 
-  only:
-    - schedules
   dependencies:
-    - job-macosx-xcode
+    - job-macosx-ninja
 
   script:
-    - scp Linphone-*-mac.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/
-    - ssh -l $DEPLOY_SERVER jenkins_link_latest $MACOSX_UPLOAD_DIRECTORY 'Linphone-*-mac.dmg'
\ No newline at end of file
+    - scp WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*-mac.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/
\ No newline at end of file
diff --git a/.gitlab-ci-files/job-windows.yml b/.gitlab-ci-files/job-windows.yml
index cb38bcff5..a7532d539 100644
--- a/.gitlab-ci-files/job-windows.yml
+++ b/.gitlab-ci-files/job-windows.yml
@@ -17,7 +17,7 @@ job-windows-vs2015:
 
   artifacts:
     paths:
-      - WORK/desktop/Build/linphone_package/Linphone-*-win32.exe
+      - WORK/desktop/Build/linphone_package/%PACKAGE_NAME%-*-win32.exe
     expire_in: 1 week
 
 #################################################
@@ -29,11 +29,8 @@ job-windows-deploy:
   stage: deploy
   tags: [ "deploy" ]
 
-  only:
-    - schedules
   dependencies:
     - job-windows-vs2015
 
   script:
-    - scp Linphone-*-win32.exe $DEPLOY_SERVER:$WINDOWS_UPLOAD_DIRECTORY/
-    - ssh -l $DEPLOY_SERVER jenkins_link_latest $WINDOWS_UPLOAD_DIRECTORY 'Linphone-*-win32.exe'
\ No newline at end of file
+    - scp WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*-win32.exe $DEPLOY_SERVER:$WINDOWS_UPLOAD_DIRECTORY/
\ No newline at end of file