From 53dcc6332a5397ba0c9c3a8ffac702a0b31a7c5a Mon Sep 17 00:00:00 2001 From: fennecdjay Date: Thu, 14 Mar 2019 11:03:27 +0100 Subject: [PATCH] :art: Update submodules --- .travis.yml | 22 +++++++++++++--------- ast | 2 +- util | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7921c1c..c06b6978 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,9 @@ env: matrix: fast_finish: true allow_failures: - - os: osx + - os: + - osx + - windows - compiler: clang compiler: @@ -61,12 +63,14 @@ before_script: ./cc-test-reporter before-build; fi; - mkdir -p "$GWION_ADD_DIR" "$GWION_TEST_DIR" - - if [ $(uname) = "Darwin" ]; then brew update; fi - - if [ $(uname) != "Linux" ] && [ $(uname) != "Darwin" ]; - then choco install make; - alias gcc=gcc.exe; - export CC="gcc.exe"; - fi + - if [ $(uname) = "Darwin" ]; + then brew update; + else if [ $(uname) != "Linux" ]; + then choco install make; + alias gcc=gcc.exe; + export CC="gcc.exe"; + fi; + fi; script: - if [ $(uname) = "Linux" ] || [ $(uname) = "Darwin" ]; @@ -74,13 +78,13 @@ script: else export CFLAGS+=-DBUILD_ON_WINDOWS; make.exe && make.exe test; - fi + fi; after_success: - if [ $TRAVIS_JOB_NUMBER = ${TRAVIS_BUILD_NUMBER}.1 ]; then bash help/lcov.sh; ./cc-test-reporter after-build -r $TRAVIS_TEST_RESULT; - fi + fi; git: diff --git a/ast b/ast index 443d0e3d..eb57cffd 160000 --- a/ast +++ b/ast @@ -1 +1 @@ -Subproject commit 443d0e3daf96f5045b931c1c8bd58474329cc716 +Subproject commit eb57cffd60e59689b0c8c61dbc4716fadf8a7373 diff --git a/util b/util index 8f6468d8..d12b13d1 160000 --- a/util +++ b/util @@ -1 +1 @@ -Subproject commit 8f6468d8edb711d41899a5378a6540bc09d25f2e +Subproject commit d12b13d1b889e1fb300f5fbb2804ade2e39e07c6 -- 2.43.0