0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00

CI: Fix Azure macOS pipeline to use new build script

This commit is contained in:
PatTheMav 2020-09-09 15:53:03 +02:00
parent 5889e2905e
commit 4bcfe5e12c
No known key found for this signature in database
GPG Key ID: F8BCC3052CE91D29
2 changed files with 23 additions and 22 deletions

View File

@ -54,11 +54,20 @@ BUILD_DEPS=(
"sparkle ${SPARKLE_VERSION:-${CI_SPARKLE_VERSION}}"
)
COLOR_RED=$(tput setaf 1)
COLOR_GREEN=$(tput setaf 2)
COLOR_BLUE=$(tput setaf 4)
COLOR_ORANGE=$(tput setaf 3)
COLOR_RESET=$(tput sgr0)
if [ -n "${TERM-}" ]; then
COLOR_RED=$(tput setaf 1)
COLOR_GREEN=$(tput setaf 2)
COLOR_BLUE=$(tput setaf 4)
COLOR_ORANGE=$(tput setaf 3)
COLOR_RESET=$(tput sgr0)
else
COLOR_RED=""
COLOR_GREEN=""
COLOR_BLUE=""
COLOR_ORANGE=""
COLOR_RESET=""
fi
MACOS_VERSION="$(sw_vers -productVersion)"
MACOS_MAJOR="$(echo ${MACOS_VERSION} | cut -d '.' -f 1)"

View File

@ -32,23 +32,15 @@ jobs:
steps:
- script: git submodule update --init --recursive
displayName: 'Checkout Submodules'
- script: ./CI/install-dependencies-osx.sh
displayName: 'Install Dependencies'
- script: ./CI/before-script-osx.sh
displayName: 'Cmake'
- bash: |
set -e
cd ./build
make -j4
cd -
displayName: 'Build'
- script: ./CI/before-deploy-osx.sh
- script: TERM="" ./CI/full-build-macos.sh
displayName: 'Install dependencies and build'
- script: TERM="" ./CI/full-build-macos.sh -s -d -b -p
condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['prHasCILabel'], true))
displayName: 'Before Deploy'
- bash: |
mkdir -p ./nightly
find ./build -name \*.dmg -exec cp -PR \{\} ./nightly/ \;
displayName: 'Copy disk image'
- task: PublishBuildArtifacts@1
condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['prHasCILabel'], true))
inputs:
@ -70,7 +62,7 @@ jobs:
displayName: 'Download / Setup Deps / Run CMake'
- task: MSBuild@1
displayName: 'Build 32-bit'
inputs:
inputs:
msbuildArguments: '/m /p:Configuration=RelWithDebInfo'
solution: .\build32\obs-studio.sln
- script: ./CI/before-deploy-win.cmd
@ -97,7 +89,7 @@ jobs:
displayName: 'Download / Setup Deps / Run CMake'
- task: MSBuild@1
displayName: 'Build 64-bit'
inputs:
inputs:
msbuildArguments: '/m /p:Configuration=RelWithDebInfo'
solution: .\build64\obs-studio.sln
- script: ./CI/before-deploy-win.cmd