Merge pull request #290 from cleandart/fix-ci-format-step

Format on Dart 2.10.4, only check formatting on stable runs
Workiva · Nov 25, 2020 · d18ce92 · d18ce92
2 parents 1cebe7f + 5dafc5e
commit d18ce92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: dart
 
 dart:
+  # We need 2.9.2 to verify the Chrome MemoryInfo workaround: https://github.com/cleandart/react-dart/pull/280
+  # TODO remove the workaround as well as this config once SDK lower bound is >=2.9.3
   - 2.9.2
   - stable
   - dev
@@ -14,7 +16,7 @@ cache:
 before_script:
   - dartanalyzer .
   - |
-    if [ "$TRAVIS_DART_VERSION" != "dev" ]; then
+    if [ "$TRAVIS_DART_VERSION" == "stable" ]; then
       dartfmt --line-length=120 --dry-run --set-exit-if-changed .
     fi
   - pub run dependency_validator -i build_runner,build_test,build_web_compilers

diff --git a/test/lifecycle_test/util.dart b/test/lifecycle_test/util.dart
@@ -40,7 +40,11 @@ mixin LifecycleTestHelper on Component {
       'context': context,
     });
 
-    var lifecycleCallback = props == null ? staticProps == null ? null : staticProps[memberName] : props[memberName];
+    var lifecycleCallback = props == null
+        ? staticProps == null
+            ? null
+            : staticProps[memberName]
+        : props[memberName];
     if (lifecycleCallback != null) {
       return Function.apply(
           lifecycleCallback,