Skip to content

Commit 36f686d

Browse files
authored
Update CI
Updates Travis CI to use Xenial as base distro Updates clang (Travis) to 6.0 Adds Azure Pipelines (Linux using our Docker Build Image + Windows)
1 parent 41243a0 commit 36f686d

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

.travis.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
language: cpp
22
sudo: false
3+
dist: xenial
34

45
matrix:
5-
allow_failures:
6-
- os: osx
7-
86
include:
97
- compiler: gcc
108
addons:
@@ -23,13 +21,13 @@ matrix:
2321
apt:
2422
sources:
2523
- ubuntu-toolchain-r-test
26-
- llvm-toolchain-trusty-4.0
24+
- llvm-toolchain-xenial-6.0
2725
packages:
28-
- clang-4.0
26+
- clang-6.0
2927
- zip
3028
env:
31-
ENV_CXX=clang++-4.0
32-
ENV_CC=clang-4.0
29+
ENV_CXX=clang++-6.0
30+
ENV_CC=clang-6.0
3331
NIGHTLY_UPLOAD=0
3432

3533
before_script:

azure-pipelines.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
resources:
2+
containers:
3+
- container: ci
4+
image: sbx320/mtasa-blue-azure:latest
5+
6+
jobs:
7+
- job: linux
8+
pool:
9+
vmImage: 'Ubuntu 16.04'
10+
container: ci
11+
steps:
12+
- script: ./linux-build.sh
13+
displayName: 'Run Build'
14+
15+
- job: windows
16+
pool:
17+
vmImage: 'VS2017-Win2016'
18+
variables:
19+
solution: 'Build/MTASA.sln'
20+
buildConfiguration: 'Release'
21+
steps:
22+
- powershell: Invoke-WebRequest https://mirror.mtasa.com/bdata/DXFiles.zip -OutFile utils/DXFiles.zip
23+
displayName: 'Download DirectX'
24+
- powershell: Expand-Archive -Path utils/DXFiles.zip -DestinationPath utils/DXFiles
25+
displayName: 'Extract DirectX'
26+
- script: utils\premake5 install_cef
27+
displayName: 'Install CEF'
28+
- script: utils\premake5 vs2017
29+
env:
30+
DXSDK_DIR: './utils/DXFiles/'
31+
CI: 'true'
32+
displayName: 'Create Visual Studio 2017 Solution'
33+
- task: VSBuild@1
34+
inputs:
35+
solution: '$(solution)'
36+
configuration: '$(buildConfiguration)'
37+

0 commit comments

Comments
 (0)