use matrix and add osx build

pull/657/head
S-YOU 2019-06-26 08:26:26 +09:00 committed by Alex Medvednikov
parent 7a2d9ef06e
commit 6a0ac35af2
3 changed files with 24 additions and 13 deletions

View File

@ -1,14 +1,25 @@
sudo: required
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-5
- g++-5
- make
language: c
matrix:
include:
- os: linux
sudo: required
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-5
- g++-5
- make
- os: osx
osx_image: xcode10.2
env:
- MATRIX_EVAL="brew install glm freetype cjson glfw"
script:
- sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-5 /usr/bin/gcc
- |
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-5 /usr/bin/gcc
fi
- export VROOT=$(pwd)
- cd ./compiler
- make

View File

@ -7,8 +7,8 @@ v: v.c
v.c:
wget https://raw.githubusercontent.com/vlang/vc/master/v.c
test:
find .. -name '*_test.v' | xargs v {}
test: v
find .. -name '*_test.v' | xargs ./v {}
clean:
-rm v.c

View File

@ -6,7 +6,7 @@ import os
import gl
import gg
fn cmp(a, b float) bool {
fn cmp(a, b f32) bool {
return int(a * 1000) == int(b * 1000)
}