Skip to content
Snippets Groups Projects
Verified Commit f5b9487c authored by Joe Donofry's avatar Joe Donofry
Browse files

More Azure CI updates

parent e983346e
No related branches found
No related tags found
No related merge requests found
parameters:
osName: 'linux'
steps: steps:
- script: | - bash: |
./.ci/install.sh
export PATH=/usr/local/bin:${PATH}
- bash: |
export TRAVIS_OS_NAME=${{ osName }}
export CXX=${CXX_COMPILER} export CXX=${CXX_COMPILER}
export CC=${C_COMPILER} export CC=${C_COMPILER}
# Use TRAVIS_TAG if defined, or the short commit SHA otherwise # Use TRAVIS_TAG if defined, or the short commit SHA otherwise
export VERSION=${TRAVIS_TAG:-$(git rev-parse --short HEAD)} export VERSION=${TRAVIS_TAG:-$(git rev-parse --short HEAD)}
- script: | - bash: |
./.ci/script.sh ./.ci/script.sh
sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true
cp ./.ci/bintray-release.json . cp ./.ci/bintray-release.json .
- script: | \ No newline at end of file
./.ci/install.sh
export PATH=/usr/local/bin:${PATH}
\ No newline at end of file
...@@ -37,6 +37,9 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then ...@@ -37,6 +37,9 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
cd libsodium-1.0.16/ cd libsodium-1.0.16/
./configure && make && make check && sudo make install ) ./configure && make && make check && sudo make install )
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main" | sudo tee /etc/apt/sources.list.d/llvm.list
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
# needed for git-lfs, otherwise the follow apt update fails. # needed for git-lfs, otherwise the follow apt update fails.
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
...@@ -44,8 +47,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then ...@@ -44,8 +47,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
# needed for mongodb repository: https://github.com/travis-ci/travis-ci/issues/9037 # needed for mongodb repository: https://github.com/travis-ci/travis-ci/issues/9037
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt update -qq sudo apt update -qq
sudo apt install -qq -y \ sudo apt install -qq -y \
g++-8 \
ninja-build \
qt${QT_PKG}base \ qt${QT_PKG}base \
qt${QT_PKG}tools \ qt${QT_PKG}tools \
qt${QT_PKG}svg \ qt${QT_PKG}svg \
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
set -ex set -ex
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
export CC=${C_COMPILER} export CC=${C_COMPILER}
export CXX=${CXX_COMPILER} export CXX=${CXX_COMPILER}
# make build use all available cores # make build use all available cores
......
...@@ -18,18 +18,37 @@ stages: ...@@ -18,18 +18,37 @@ stages:
pool: pool:
vmImage: 'ubuntu-16.04' vmImage: 'ubuntu-16.04'
variables:
CXX_COMPILER: 'clang++-5.0'
C_COMPILER: 'clang-5.0'
QT_VERSION: '592'
QT_PKG: '59'
USE_BUNDLED_BOOST: '1'
USE_BUNDLED_CMARK: '1'
USE_BUNDLED_JSON: '1'
steps: steps:
- template: .ci/azure-build.yml - template: .ci/azure-build.yml
parameters:
osName: 'linux'
- job: macOS - job: macOS
pool: pool:
vmImage: 'macOS-10.13' vmImage: 'macOS-10.13'
variables:
DEPLOYMENT: '1'
USE_BUNDLED_BOOST: '0'
USE_BUNDLED_CMARK: '0'
USE_BUNDLED_JSON: '0'
steps: steps:
- template: .ci/azure-build.yml - template: .ci/azure-build.yml
parameters:
osName: 'osx'
- job: Windows - job: Windows
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
steps: steps:
- template: .ci/azure-build.yml - template: .ci/azure-build.yml
\ No newline at end of file parameters:
osName: 'windows'
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment