From 93b3eaa81e6e6162961eaabb5986c6ef4cc02028 Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Wed, 10 Feb 2021 17:58:58 +0100 Subject: [PATCH] updated .cirrus.yml and .travis.yml --- .cirrus.yml | 5 +- .idea/libraries/Dart_Packages.xml | 312 ++++++++++++++++++++++++++++++ .travis.yml | 12 +- scripts/test.sh | 2 +- 4 files changed, 328 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ff1514ea..cb4dd14a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,5 @@ task: + only_if: $CIRRUS_BRANCH == 'master' # Xcode 12 task osx_instance: image: big-sur-xcode-12.4 @@ -37,6 +38,7 @@ task: folder: ~/.pub-cache task: + only_if: $CIRRUS_BRANCH == 'master' env: API: 30 GOO: "google_apis" @@ -102,6 +104,7 @@ task: - export NVM_DIR="$HOME/.nvm" - source "$NVM_DIR/nvm.sh" # This loads nvm - nvm use node - - ./scripts/test.sh $(ifconfig en0 | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}') + - flutter channel $CHANNEL + - ./scripts/test.sh $(ip route get 1 | awk '{print $NF;exit}') pub_cache: folder: ~/.pub-cache diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 1c04bed1..787c9c8a 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -2,10 +2,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -442,11 +747,18 @@ + + + + + + + diff --git a/.travis.yml b/.travis.yml index fa8076ae..8b124ada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: dart +branches: + only: + - master + jobs: include: - stage: iOS Integration Tests @@ -28,6 +32,7 @@ jobs: - xcrun simctl list - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-12 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot script: + - flutter channel master - ./scripts/test.sh $(ipconfig getifaddr en0) cache: directories: @@ -37,6 +42,10 @@ jobs: - stage: Android Integration Tests language: android dist: trusty + addons: + apt: + packages: + - iproute2 android: components: - tools @@ -79,7 +88,8 @@ jobs: - export NVM_DIR="$HOME/.nvm" - source "$NVM_DIR/nvm.sh" # This loads nvm - nvm use node - - ./scripts/test.sh $(ifconfig en0 | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}') + - flutter channel master + - ./scripts/test.sh $(ip route get 1 | awk '{print $NF;exit}') cache: directories: - $HOME/.pub-cache \ No newline at end of file diff --git a/scripts/test.sh b/scripts/test.sh index cd56c3d0..947257c2 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -8,7 +8,7 @@ function error() { } # on macOS local IP can be found using $(ipconfig getifaddr en0) -# on linux local IP can be found using $(ifconfig en0 | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}') +# on linux local IP can be found using $(ifconfig en0 | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}') or $(ip route get 1 | awk '{print $NF;exit}') export NODE_SERVER_IP=$1 FAILED=0