frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Release preparation

Browse Source 
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>
This commit is contained in:
Paulchen-Panther 2019-06-15 15:46:56 +02:00
parent a06b4b8067
commit 5e1398a7e5
No known key found for this signature in database
GPG Key ID: 84E3B692456B6840
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.azure.yml
View File

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

7
.ci/ci_build.sh
View File

@ -16,7 +16,7 @@ fi
# set environment variables # set environment variables
BUILD_TYPE="Debug" BUILD_TYPE="Debug"
PACKAGES="" [ -z "${PACKAGES}" ] && PACKAGES=""
[ -z "${PLATFORM}" ] && PLATFORM="x11" [ -z "${PLATFORM}" ] && PLATFORM="x11"
# Detect number of processor cores # Detect number of processor cores
@ -50,7 +50,10 @@ if [[ "$CI_NAME" == 'osx' || "$CI_NAME" == 'darwin' ]]; then
mkdir ${CI_BUILD_DIR}/deploy || exit 1 mkdir ${CI_BUILD_DIR}/deploy || exit 1
cd build cd build
cmake -DPLATFORM=$PLATFORM -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr .. || exit 2 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" 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/bin/h* ${CI_BUILD_DIR}/deploy/ 2>/dev/null || : &&
cp -v ${CI_BUILD_DIR}/build/Hyperion-* ${CI_BUILD_DIR}/deploy/ 2>/dev/null || : && cp -v ${CI_BUILD_DIR}/build/Hyperion-* ${CI_BUILD_DIR}/deploy/ 2>/dev/null || : &&