]> Nishi Git Mirror - gwion.git/commitdiff
:art: Update submodules
authorfennecdjay <astor.jeremie@wanadoo.fr>
Thu, 14 Mar 2019 10:03:27 +0000 (11:03 +0100)
committerfennecdjay <astor.jeremie@wanadoo.fr>
Thu, 14 Mar 2019 10:12:01 +0000 (11:12 +0100)
.travis.yml
ast
util

index a7921c1c176740298a13b56665c128b786a29777..c06b6978f019ca407c3b97049d6debcf86846a99 100644 (file)
@@ -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 443d0e3daf96f5045b931c1c8bd58474329cc716..eb57cffd60e59689b0c8c61dbc4716fadf8a7373 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 443d0e3daf96f5045b931c1c8bd58474329cc716
+Subproject commit eb57cffd60e59689b0c8c61dbc4716fadf8a7373
diff --git a/util b/util
index 8f6468d8edb711d41899a5378a6540bc09d25f2e..d12b13d1b889e1fb300f5fbb2804ade2e39e07c6 160000 (submodule)
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit 8f6468d8edb711d41899a5378a6540bc09d25f2e
+Subproject commit d12b13d1b889e1fb300f5fbb2804ade2e39e07c6