Merge branch 'v2' of https://github.com/wix/react-native-navigation into v2

.travis.yml

@@ -1,69 +0,0 @@
-env:
-  global:
-    - RCT_NO_LAUNCH_PACKAGER=true
-
-jobs:
-  include:
-
-    - stage: test
-      env: TYPE=js
-      os: linux
-      language: generic
-      script:
-        - ./scripts/travis-fold.sh "npm run test-js"
-
-    - stage: test
-      env: TYPE=iOS
-      os: osx
-      osx_image: xcode9
-      language: objective-c
-      before_install:
-        - source ./scripts/env/env.ios.sh
-      script:
-        - ./scripts/travis-fold.sh "npm run test-unit-ios -- --release"
-        - ./scripts/travis-fold.sh "npm run test-e2e-ios -- --release"
-
-    - stage: test
-      env: TYPE=Android
-      os: linux
-      jdk: oraclejdk8
-      language: java
-      before_install:
-        - source ./scripts/env/env.android.sh
-      script:
-        - ./scripts/travis-fold.sh "npm run test-unit-android -- --release"
-        - ./scripts/travis-fold.sh "npm run test-e2e-android -- --release"
-      before_cache:
-        - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-        - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-      cache:
-        directories:
-          - $HOME/.m2
-          - $HOME/.gradle/caches/
-          - $HOME/.gradle/wrapper/
-          - $HOME/.android/build-cache
-
-    - stage: deploy
-      if: NOT type = pull_request
-      env: TYPE=deploy
-      os: linux
-      language: generic
-      script:
-          - ./scripts/travis-fold.sh "npm run release"
-
-branches:
-  only:
-  - master
-  - v2
-
-install:
-  - nvm install 8
-  - ./scripts/travis-fold.sh "npm install"
-  - ./scripts/travis-fold.sh "npm run clean"
-
-after_script:
-  - echo "BUILD FINISHED"
-
-notifications:
-  slack:
-    secure: tZRC5hbi7iWy4hgWC0ET67kOKjn77945UZJEm8XeOnahVjfBL7gSpBTtyjD6D7Ah7qJTZNtK2lfItciT4gJfH4HYDVUBlLYKzVvw/9usYpEvsdAaAnpT2gMwXHEIupUYh0tv5ccvHt/SqHmK0HVTFdzGR/IztmHIcFlDcbNdTUtUg+9RUTBkO2n946UHk/I8xKhW4GefEuv4bRbm44H27G/VWcOABsMNvYA+kF7VDTjSlyJmACgG1BMbMDwn6lM6c7HLhVbQi52Oyt9E3dz0o1/puWldq60jiESsay99CrAr4pi4LAeMu+TdQnc8QzsCd+CZBFNIk1t56ElM2aQ8w43W+IYfu1/0+w12ySOasamqyOdLJng0MXmqzVoBcfisefVuBNmx4n+yQO+qu4a3Qze/PgPeqWHF9Jy5EbVezg+lb/4m/0NK/3o2za3dJjTKJGxuCLvdCGLVEeDLw50FQxbV+k+tgeB/1jmIWymhdUteWBjBdPUqL+ntaqWuSbMjC0euOdGkR1ibfYaUy5UmBtTRkcb/AwSti9lCNdBN8Ez1qmIO4U92gN93B10fEObLjv76T7NLJQUPks/u4nCClsYRclJPDTDe/kv9HL6R6eHJGWd045r0tKtYj1WVFUlv8EvB5rIzVKCn6cjM636+enavuTzg66aRZvu8DgNqLNo=

Jenkinsfile

@@ -1,38 +0,0 @@
-pipeline {
-  agent any
-  stages {
-    stage('Install npm packages') {
-      steps {
-      ansiColor('xterm') {
-        sh '''#!/bin/bash -ex
-        npm install
-        npm run clean'''
-        }
-      }
-    }
-    stage('Run All Tests') {
-      parallel {
-        stage('Run test-js') {
-          steps {
-            sh '''#!/bin/bash
-            npm run test-js'''
-          }
-        }
-        stage('Run iOS tests') {
-          steps {
-            sh '''#!/bin/bash
-            npm run test-unit-ios -- --release
-            npm run test-e2e-ios -- --release'''
-          }
-        }
-        stage('Run Android tests') {
-          steps {
-            sh '''#!/bin/bash
-            npm run test-unit-android -- --release'''
-          }
-        }
-      }
-    }
-  }
-}
-

docs/README.md

@@ -1,6 +1,5 @@
 [![npm (tag)](https://img.shields.io/npm/v/react-native-navigation/alpha.svg)](https://github.com/wix/react-native-navigation/tree/v2#react-native-navigation-v2-wip)
-[![Build Status](https://travis-ci.org/wix/react-native-navigation.svg?branch=v2)](https://travis-ci.org/wix/react-native-navigation)
-[![Build Status](http://34.201.210.182/buildStatus/icon?job=react-native-navigation-merge)](http://34.201.210.182/job/react-native-navigation-merge/)
+[![Build Status](http://34.201.210.182/buildStatus/icon?job=react-native-navigation-master)](http://34.201.210.182/job/react-native-navigation-master)
 [![Join us on Discord](https://img.shields.io/badge/discord-react--native--navigation-738bd7.svg?style=flat)](https://discord.gg/DhkZjq2)
 [![StackExchange](https://img.shields.io/stackexchange/stackoverflow/t/react-native-navigation.svg)](https://stackoverflow.com/questions/tagged/react-native-navigation)
 
@@ -212,3 +211,4 @@ Note:  v1 properties with names beginning with 'navBar' are replaced in v2 with
 | splitViewScreen       |     :x:  |    [Contribute](/docs/WorkingLocally.md)      | [Contribute](/docs/WorkingLocally.md)|
 
 Element transitions, adding buttons and styles are not yet implemented. [Contribute](/docs/WorkingLocally.md)
+

scripts/release.js

@@ -4,7 +4,7 @@ const semver = require('semver');
 const fs = require('fs');
 const _ = require('lodash');
 
-const ONLY_ON_BRANCH = 'v2';
+const ONLY_ON_BRANCH = 'origin/v2';
 const VERSION_TAG = 'alpha';
 const VERSION_INC = 'patch';
 
@@ -18,17 +18,17 @@ function run() {
 }
 
 function validateEnv() {
-  if (!process.env.CI || !process.env.TRAVIS) {
-    throw new Error(`releasing is only available from Travis CI`);
+  if (!process.env.CI) {
+    throw new Error(`releasing is only available from CI`);
   }
 
-  if (process.env.TRAVIS_PULL_REQUEST !== 'false') {
-    console.log(`not publishing as triggered by pull request ${process.env.TRAVIS_PULL_REQUEST}`);
+  if (!process.env.JENKINS_MASTER) {
+    console.log(`not publishing on a different build`);
     return false;
   }
 
-  if (process.env.TRAVIS_BRANCH !== ONLY_ON_BRANCH) {
-    console.log(`not publishing on branch ${process.env.TRAVIS_BRANCH}`);
+  if (process.env.GIT_BRANCH !== ONLY_ON_BRANCH) {
+    console.log(`not publishing on branch ${process.env.GIT_BRANCH}`);
     return false;
   }
 

scripts/travis-fold.sh

@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-lightCyan='\033[1;36m'
-green='\033[0;32m'
-nocolor='\033[0m'
-
-cmd="${1}"
-name=${cmd//[ ]/_}
-
-echo "travis_fold:start:$name"
-echo -e "${lightCyan}\t\t $cmd ${nocolor}"
-SECONDS=0
-
-($cmd)
-
-duration=$SECONDS
-echo "travis_fold:end:$name"
-echo -e "${green}\t\t\t --> $(($duration / 60)) minutes and $(($duration % 60)) seconds ${nocolor}\n"