Merge remote-tracking branch 'openbci/master'

.travis.yml

@@ -24,22 +24,24 @@ addons:
       - python3
       - python3-setuptools
       - python3-pip
-      - r-base
+      # - r-base
       - libxml2-dev
       - valgrind
-  homebrew:
-    packages:
-      - r
-    update: true
+  # R disabled. It's taking up too much time in CI
+  # homebrew:
+  #   packages:
+  #     - r
+  #   update: true
 
 install:
   - sudo pip3 install --upgrade pip
   - sudo pip3 install cmake==3.13.0
   - sudo -H pip3 install --upgrade setuptools wheel virtualenv
   - sudo -H pip3 install $TRAVIS_BUILD_DIR/emulator
-  # install required packages for R
-  - sudo -H R --vanilla -e 'install.packages("knitr", repos="http://cran.us.r-project.org")'
-  - sudo -H R --vanilla -e 'install.packages("reticulate", repos="http://cran.us.r-project.org")'
+  # R disabled. It's taking up too much time in CI
+  # # install required packages for R
+  # - sudo -H R --vanilla -e 'install.packages("knitr", repos="http://cran.us.r-project.org")'
+  # - sudo -H R --vanilla -e 'install.packages("reticulate", repos="http://cran.us.r-project.org")'
 
 before_script:
   # need to build in manylinux docker container!
@@ -59,7 +61,8 @@ before_script:
       cd $TRAVIS_BUILD_DIR && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/installed .. && make && make install ;
     fi
   - sudo -H pip3 install $TRAVIS_BUILD_DIR/python-package
-  - cd $TRAVIS_BUILD_DIR/r-package/brainflow && sudo -H R CMD build . && sudo -H R CMD INSTALL brainflow_0.0.0.9000.tar.gz
+  # R disabled. It's taking up too much time in CI
+  # - cd $TRAVIS_BUILD_DIR/r-package/brainflow && sudo -H R CMD build . && sudo -H R CMD INSTALL brainflow_0.0.0.9000.tar.gz
   - cd $TRAVIS_BUILD_DIR/tests/cpp && mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/installed .. && make
   - cd $TRAVIS_BUILD_DIR && cd java-package/brainflow && mvn package
 
@@ -74,7 +77,8 @@ script:
   # tests for synthetic board
   - python3 $TRAVIS_BUILD_DIR/tests/python/brainflow_get_data.py --log --board-id -1
   - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TRAVIS_BUILD_DIR/installed/lib $TRAVIS_BUILD_DIR/tests/cpp/build/test_get_data --board-id -1
-  - Rscript $TRAVIS_BUILD_DIR/tests/r/brainflow_get_data.R
+  # R disabled. It's taking up too much time in CI
+  # - Rscript $TRAVIS_BUILD_DIR/tests/r/brainflow_get_data.R
   # tests for cyton daisy
   - sudo -H python3 $TRAVIS_BUILD_DIR/emulator/brainflow_emulator/cyton_linux.py python3 $TRAVIS_BUILD_DIR/tests/python/brainflow_get_data.py --log --board-id 2 --serial-port 
   - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TRAVIS_BUILD_DIR/installed/lib python3 $TRAVIS_BUILD_DIR/emulator/brainflow_emulator/cyton_linux.py $TRAVIS_BUILD_DIR/tests/cpp/build/test_get_data --board-id 2 --serial-port
@@ -106,6 +110,10 @@ script:
 #   # notify that everything is ok
 #   - echo success > ${TRAVIS_OS_NAME}_success && aws s3 cp ${TRAVIS_OS_NAME}_success s3://brainflow-artifacts/$TRAVIS_COMMIT/
 
+after_failure:
+  # notify Appveyor of travis test failure
+  echo failure > ${TRAVIS_OS_NAME}_failure && aws s3 cp ${TRAVIS_OS_NAME}_failure s3://brainflow-artifacts/$TRAVIS_COMMIT/
+
 notifications:
   email:
     on_success: never

appveyor.yml

@@ -113,7 +113,6 @@ after_test:
 #       }
 #       nuget pack brainflow.csproj -properties Configuration=Release -IncludeReferencedProjects;
 #       aws s3 cp %APPVEYOR_BUILD_FOLDER%\csharp-package\brainflow\brainflow s3://brainflow-artifacts/%APPVEYOR_REPO_COMMIT%/nuget --recursive;
-
 #       $lin = $false;
 #       $osx = $false;
 #       for ($i=0; $i -lt 30; $i++) {
@@ -123,6 +122,15 @@ after_test:
 #         aws s3 ls s3://brainflow-artifacts/$env:APPVEYOR_REPO_COMMIT/osx_success;
 #         $osx = $?
 #         if($lin -and $osx) {break}
+#         # stop waiting if linux or mac tests fail
+#         aws s3 ls s3://brainflow-artifacts/$env:APPVEYOR_REPO_COMMIT/linux_failure;
+#         $lin_fail = $?;
+#         aws s3 ls s3://brainflow-artifacts/$env:APPVEYOR_REPO_COMMIT/osx_failure;
+#         $osx_fail = $?
+#         if($lin_fail -or $osx_fail) {
+#           write-output "Skip deployment, travis build failed"
+#           break
+#         }
 #         Start-Sleep -s 60;
 #         echo "not found"
 #       }