Release preparation

OSX packaging is currently broken. CPack is now called individually so that the make process is no longer displayed incorrectly in Travis / Azure.
The variable PACKAGES in the build script is no longer overwritten, so in travis / Azure you can globally assign the variable and start a package build process manually.

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>

.azure.yml

@@ -31,8 +31,16 @@ jobs:
       DOCKER_TAG: $(dockerTag)
       DOCKER_NAME: $(dockerName)
       PLATFORM: $(platform)
-  - bash: ./.ci/ci_deploy.sh
-    displayName: 'Upload $(dockerName)'
+  - task: CopyFiles@2
+    displayName: 'Copy Files'
+    inputs:
+      contents: '**/deploy/**'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: $(dockerName)'
+    inputs:
+      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: $(dockerTag)
 
 - job: macOS
   pool:
@@ -44,5 +52,13 @@ jobs:
     displayName: 'Install dependencies'
   - bash: ./.ci/ci_build.sh
     displayName: 'Build macOS 10.13'
-  - bash: ./.ci/ci_deploy.sh
-    displayName: 'Upload macOS 10.13'
+  - task: CopyFiles@2
+    displayName: 'Copy Files'
+    inputs:
+      contents: '**/deploy/**'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: macOS 10.13'
+    inputs:
+      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: 'macOS'

.ci/ci_build.sh

@@ -16,7 +16,7 @@ fi
 
 # set environment variables
 BUILD_TYPE="Debug"
-PACKAGES=""
+[ -z "${PACKAGES}" ] && PACKAGES=""
 [ -z "${PLATFORM}" ] && PLATFORM="x11"
 
 # Detect number of processor cores
@@ -50,7 +50,10 @@ if [[ "$CI_NAME" == 'osx' || "$CI_NAME" == 'darwin' ]]; then
 	mkdir ${CI_BUILD_DIR}/deploy || exit 1
 	cd build
 	cmake -DPLATFORM=$PLATFORM -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr .. || exit 2
-	make -j ${JOBS} ${PACKAGES} || exit 3
+	make -j ${JOBS} || exit 3
+	if [[ "$PACKAGES" == 'package' ]]; then
+		sudo cpack
+	fi
 	echo "---> Copy binaries and packages to folder: ${CI_BUILD_DIR}/deploy"
 	cp -v ${CI_BUILD_DIR}/build/bin/h* ${CI_BUILD_DIR}/deploy/ 2>/dev/null || : &&
 	cp -v ${CI_BUILD_DIR}/build/Hyperion-* ${CI_BUILD_DIR}/deploy/ 2>/dev/null || : &&