Make sure xcuitest driver is built when bundling (#11871)

* Make sure xcuitest driver is built when bundling * Test documentation generation on PRs too * Run docs gen testing on Linux
appium · Dec 19, 2018 · 5229607 · 5229607
1 parent afab8be
commit 5229607
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,11 +24,18 @@ jobs:
       script: npm run test && npm run e2e-test
       node_js: "8"
     - stage:
+      name: test documentation generation
+      os: linux
+      before_script:
+        - npm install
+      script:
+        - npm run generate-docs
+
+    - stage: Auto-generate documentation
       os: osx
       if: branch = master AND type != pull_request AND !tag
       env:
-        # this is just to indicate in the Travis job list that this is generating docs
-        - GENERATE_DOCS=true GITHUB_TOKEN=$TRIAGER_BOT_TOKEN
+        - GITHUB_TOKEN=$TRIAGER_BOT_TOKEN
       before_script:
         - brew install hub
         - hub --version
@@ -60,13 +67,22 @@ jobs:
         - CXX=g++
       before_install:
         - gcc --version
+        - brew upgrade carthage
       install:
         # Install prod dependencies
         - npm install
 
         # Install only the dev dependencies that we need
         - npm install --only=dev gulp
         - npm install --only=dev appium-gulp-plugins
+
+        # get appium-xcuitest-driver fully built
+        - pushd node_modules/appium-xcuitest-driver/WebDriverAgent
+        # do not use build script because Travis _will_ have rate limits
+        - carthage bootstrap --no-use-binaries
+        - cp Cartfile.resolved Carthage
+        - mkdir -p ./Resources/WebDriverAgent.bundle
+        - popd
       before_script:
         # Build the assets
         - npm run build

diff --git a/test/scripts/bintray-upload.js b/test/scripts/bintray-upload.js
@@ -66,15 +66,15 @@ const log = logger.getLogger('Bintray');
       }
     });
   } catch (e) {
-    if (e.statusCode !== 409) {
+    if (e.statusCode === 409) {
       // Doesn't fail on 409 because sometimes 409 means that the asset was already published
       // and if that's the case, we don't want it to fail
-      log.error(`Didn't publish upload. Upload is already available. Reason:`, e.message);
+      log.error(`Did not publish upload. Upload is already available. Reason: ${e.message}`);
     } else {
       log.error(`Failed to publish 'appium.zip' to ${BUILD_NAME}. Reason: ${JSON.stringify(e)}`);
       process.exit(-1);
     }
   }
   log.info(`Done publishing 'appium.zip' to ${BUILD_NAME}`);
 
-})();
+})();