Skip to content

Commit 3ceb444

Browse files
Update .travis.yml (#23)
* Update .travis.yml
1 parent fbb9ee5 commit 3ceb444

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

.travis.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,18 @@ matrix:
1414
packages:
1515
- gcc-8
1616
- g++-8
17-
before_script: cd runtime
18-
script:
19-
- CXX=/usr/bin/g++-8
20-
- CC=/usr/bin/gcc-8
21-
- cmake -DCMAKE_BUILD_TYPE=Release -B"cmake-build-linux" .
22-
- make
23-
- cd src
24-
- ls -l
2517
- os: windows
26-
before_script: cd runtime
27-
script:
28-
- mkdir build && cd build
29-
- cmake -G"Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -T host=x64 ..
30-
- cmake --build . --config Release
31-
- ls -l
32-
- cd Release
33-
- ls -l
18+
before_script: cd runtime
19+
script:
20+
- mkdir build && cd build
21+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then if ! [ -x "$(command /usr/bin/g++-8 -v)" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;sudo apt-get update;sudo apt-get -y install gcc-8 g++-8 ; fi ; fi
22+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then CXX=/usr/bin/g++-8 ; fi
23+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then CC=/usr/bin/gcc-8 ; fi
24+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake -DCMAKE_BUILD_TYPE=Release .. ; fi
25+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then cmake -G"Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -T host=x64 .. ; fi
26+
- cmake --build . --config Release
27+
- cd src
28+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then cd Release ; fi
3429
deploy:
3530
- provider: releases
3631
skip_cleanup: true

runtime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.12.3)
1+
cmake_minimum_required(VERSION 3.9.2)
22
project(altv-clr-host LANGUAGES CXX)
33

44
include(GNUInstallDirs)

runtime/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.12.3)
1+
cmake_minimum_required (VERSION 3.9.2)
22

33
set(TARGET_NAME core_clr_host)
44

0 commit comments

Comments
 (0)