updated flutter-drive.yml

2021-02-11 12:22:14 +01:00 · 2021-02-11 12:22:14 +01:00 · 659a282fcb
commit 659a282fcb
parent e9da7c805d
4 changed files with 6 additions and 208 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -1,108 +0,0 @@
-task:
-  only_if: $CIRRUS_BRANCH == 'master'
-  # Xcode 12 task
-  osx_instance:
-    image: big-sur-xcode-12.4
-  install_node_script:
-    - brew install node
-    - cd ./nodejs_server_test_auth_basic_and_ssl
-    - npm install
-  upgrade_script:
-    - sudo gem install cocoapods
-    #- flutter channel stable
-    #- flutter upgrade
-    #- flutter channel beta
-    #- flutter upgrade
-    #- flutter channel dev
-    #- flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - git fetch origin master
-  submodules_script:
-    - git submodule init
-    - git submodule update
-  matrix:
-    - name: test_plugin_ios
-      env:
-        matrix:
-          CHANNEL: "master"
-          #CHANNEL: "dev"
-          #CHANNEL: "beta"
-          #CHANNEL: "stable"
-      test_script:
-        - xcrun simctl list
-        - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-12 com.apple.CoreSimulator.SimRuntime.iOS-14-4 | xargs xcrun simctl boot
-        - flutter channel $CHANNEL
-        - ./scripts/test.sh $(ipconfig getifaddr en0)
-      pub_cache:
-        folder: ~/.pub-cache
-
-task:
-  only_if: $CIRRUS_BRANCH == 'master'
-  env:
-    API: 30
-    GOO: "google_apis"
-    ABI: "x86"
-  container:
-    image: cirrusci/flutter:latest
-    cpu: 8
-    memory: 16G
-    kvm: true
-  install_node_script:
-    - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
-    - export NVM_DIR="$HOME/.nvm"
-    - source "$NVM_DIR/nvm.sh"  # This loads nvm
-    - nvm install node
-    - nvm use node
-    - cd ./nodejs_server_test_auth_basic_and_ssl
-    - npm install
-  upgrade_script:
-    - flutter channel master
-    - flutter upgrade
-    - git fetch origin master
-  submodules_script:
-    - git submodule init
-    - git submodule update
-  matrix:
-    - name: test_plugin_android
-      env:
-        matrix:
-          CHANNEL: "master"
-          #CHANNEL: "dev"
-          #CHANNEL: "beta"
-          #CHANNEL: "stable"
-      install_iproute2_script:
-        - apt-get update
-        - apt install -y iproute2
-      install_emulator_script:
-        - sdkmanager "system-images;android-$API;$GOO;$ABI" > /dev/null
-      create_emulator_script:
-        - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$API;$GOO;$ABI"
-      start_emulator_background_script:
-        - EMU_PARAMS="
-          -avd test
-          -verbose
-          -no-window
-          -no-audio
-          "
-        - |
-          EMU_COMMAND=emulator
-          if [[ $ABI =~ "x86" ]]; then
-            EMU_COMMAND="emulator"
-          else
-            # emulate graphics if running on ARM
-            EMU_PARAMS="${EMU_PARAMS} -gpu swiftshader"
-          fi
-        - ${ANDROID_HOME}/emulator/${EMU_COMMAND} ${EMU_PARAMS}
-      wait_for_emulator_script:
-        - ./scripts/android-wait-for-emulator.sh
-      doctor_script: flutter doctor -v
-      test_script:
-        - export PATH="$PATH":"$HOME/.pub-cache/bin"
-        - export NVM_DIR="$HOME/.nvm"
-        - source "$NVM_DIR/nvm.sh"  # This loads nvm
-        - nvm use node
-        - flutter channel $CHANNEL
-        - ./scripts/test.sh $(ip route get 1 | awk '{print $NF;exit}')
-      pub_cache:
-        folder: ~/.pub-cache
--- a/.github/workflows/flutter-drive.yml
+++ b/.github/workflows/flutter-drive.yml
@ -6,6 +6,9 @@ on:
  push:
    branches:
      - master
+  pull_request:
+    branches:
+      - master
 # A workflow run is made up of one or more jobs.
 jobs:
  # id of job, a string that is unique to the "jobs" node above.
@ -116,7 +119,7 @@ jobs:
      - name: "Run Android Flutter Integration Test"
        uses: ReactiveCircus/android-emulator-runner@v2.14.3
        with:
-          api-level: 30
-          target: google_apis
+          api-level: 29
+          target: default
          avd-name: Flutter-Android
          script: ./scripts/test.sh $(ipconfig getifaddr en0)
--- a/.travis.yml
+++ b/.travis.yml
@ -1,97 +0,0 @@
-language: dart
-
-branches:
-  only:
-    - master
-
-jobs:
-  include:
-    - stage: iOS Integration Tests
-      os: osx
-      osx_image: xcode12.3
-      install:
-        - export HOMEBREW_NO_AUTO_UPDATE=1
-        - brew install node
-        - brew install libimobiledevice ideviceinstaller ios-deploy
-        - brew install cocoapods || echo 'ignore exit(1)'
-        - brew link --overwrite cocoapods
-        - export FLUTTER_HOME=$HOME/flutter
-        - export PATH=$HOME/flutter:$HOME/flutter/bin/:$HOME/flutter/bin/cache/dart-sdk/bin:$PATH
-        - git clone https://github.com/flutter/flutter.git $FLUTTER_HOME
-        - cd $FLUTTER_HOME
-        - git checkout beta
-        - git checkout stable
-        - flutter doctor
-        - flutter channel master
-        - flutter upgrade
-        - flutter doctor
-        - cd $TRAVIS_BUILD_DIR/nodejs_server_test_auth_basic_and_ssl
-        - npm install
-        - cd $TRAVIS_BUILD_DIR
-      before_script:
-        - 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:
-          - $HOME/.pub-cache
-
-  include:
-    - stage: Android Integration Tests
-      language: android
-      dist: trusty
-      addons:
-        apt:
-          packages:
-            - iproute2
-      android:
-        components:
-          - tools
-          - platform-tools
-          - build-tools-30.0.0
-          - android-30
-          - sys-img-x86-android-30
-      licenses:
-        - 'android-sdk-preview-license-.+'
-        - 'android-sdk-license-.+'
-        - 'google-gdk-license-.+'
-      before_install:
-        - mkdir -p .android && touch ~/.android/repositories.cfg
-        - yes | sdkmanager --update
-        - yes | sdkmanager tools
-        - yes | sdkmanager "system-images;android-30;google_apis;x86"
-        - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-30;google_apis;x86"
-        - emulator -avd test -verbose -no-window -no-audio &
-        - ./scripts/android-wait-for-emulator.sh
-      install:
-        - export FLUTTER_HOME=$HOME/flutter
-        - export PATH=$HOME/flutter:$HOME/flutter/bin/:$HOME/flutter/bin/cache/dart-sdk/bin:$PATH
-        - git clone https://github.com/flutter/flutter.git $FLUTTER_HOME
-        - cd $FLUTTER_HOME
-        - git checkout beta
-        - git checkout stable
-        - flutter doctor
-        - flutter channel master
-        - flutter upgrade
-        - flutter doctor
-        - cd $TRAVIS_BUILD_DIR
-        - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
-        - export NVM_DIR="$HOME/.nvm"
-        - source "$NVM_DIR/nvm.sh"  # This loads nvm
-        - nvm install node
-        - nvm use node
-        - cd $TRAVIS_BUILD_DIR/nodejs_server_test_auth_basic_and_ssl
-        - npm install
-        - cd $TRAVIS_BUILD_DIR
-      script:
-        - export PATH="$PATH":"$HOME/.pub-cache/bin"
-        - export NVM_DIR="$HOME/.nvm"
-        - source "$NVM_DIR/nvm.sh"  # This loads nvm
-        - nvm use node
-        - flutter channel master
-        - ./scripts/test.sh $(ip route get 1 | awk '{print $NF;exit}')
-      cache:
-        directories:
-          - $HOME/.pub-cache
--- a/scripts/test.sh
+++ b/scripts/test.sh
@ -20,7 +20,7 @@ node index.js &
 flutter clean
 cd $PROJECT_DIR/example
 flutter clean
-flutter driver --driver=test_driver/integration_test.dart --target=integration_test/webview_flutter_test.dart
+flutter driver --driver=test_driver/integration_test.dart --target=integration_test/webview_flutter_test.dart --verbose

 if [ $? -eq 0 ]; then
  echo "Integration tests passed successfully."