Be patch tolerent for test environments.

arnesson · Nov 8, 2018 · b04abb8 · b04abb8
1 parent 5898527
commit b04abb8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -104,5 +104,5 @@ before_install:
 - if [[ "$CORDOVA_PLATFORM" == "android" ]]; then yes | sdkmanager "build-tools;26.0.0" "platforms;android-26" ; fi
 
 script:
-- bash ./test/test-default.sh $CORDOVA_VERSION $CORDOVA_PLATFORM $CORDOVA_PLATFORM_VERSION
-- if [[ "$CORDOVA_PLATFORM" == "android" ]]; then bash ./test/test-with-3-plugins.sh $CORDOVA_VERSION $CORDOVA_PLATFORM $CORDOVA_PLATFORM_VERSION cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release; fi
+- bash ./test/test-default.sh ~$CORDOVA_VERSION $CORDOVA_PLATFORM ~$CORDOVA_PLATFORM_VERSION
+- if [[ "$CORDOVA_PLATFORM" == "android" ]]; then bash ./test/test-with-3-plugins.sh ~$CORDOVA_VERSION $CORDOVA_PLATFORM ~$CORDOVA_PLATFORM_VERSION cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release; fi
diff --git a/package.json b/package.json
@@ -35,15 +35,15 @@
     "test:android": "npm run test:[email protected]:[email protected] && npm run test:[email protected]:[email protected] && npm run test:[email protected]:[email protected]",
     "test:browser": "npm run test:[email protected]:[email protected] && npm run test:[email protected]:[email protected] && npm run test:[email protected]:[email protected]",
     "test:ios": "npm run test:[email protected]:[email protected] && npm run test:[email protected]:[email protected] && npm run test:[email protected]:[email protected]",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 6.5.0 ios 4.5.4",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 7.1.0 ios 4.5.4",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 8.0.0 ios 4.5.4",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 6.5.0 android 6.4.0 && bash ./test/test-with-3-plugins.sh 6.5.0 android 6.4.0 cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 7.1.0 android 7.1.0 && bash ./test/test-with-3-plugins.sh 7.1.0 android 7.1.0 cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 8.0.0 android 7.1.0 && bash ./test/test-with-3-plugins.sh 8.0.0 android 7.1.0 cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 6.5.0 browser 5.0.3",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 7.1.0 browser 5.0.3",
-    "test:[email protected]:[email protected]": "bash ./test/test-default.sh 8.0.0 browser 5.0.3"
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~6.5.0 ios ~4.5.4",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~7.1.0 ios ~4.5.4",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~8.0.0 ios ~4.5.4",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~6.5.0 android ~6.4.0 && bash ./test/test-with-3-plugins.sh ~6.5.0 android ~6.4.0 cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~7.1.0 android ~7.1.0 && bash ./test/test-with-3-plugins.sh ~7.1.0 android ~7.1.0 cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~8.0.0 android ~7.1.0 && bash ./test/test-with-3-plugins.sh ~8.0.0 android ~7.1.0 cordova-plugin-request-location-accuracy cordova-android-play-services-gradle-release cordova-android-firebase-gradle-release",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~6.5.0 browser ~5.0.3",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~7.1.0 browser ~5.0.3",
+    "test:[email protected]:[email protected]": "bash ./test/test-default.sh ~8.0.0 browser ~5.0.3"
   },
   "dependencies": {}
 }
diff --git a/test/plugin-add.sh b/test/plugin-add.sh
@@ -10,7 +10,7 @@ PLUGIN=$4
 FOLDER=".build-$PLATFORM"
 cd $FOLDER
 
-CORDOVA_MAJOR_VERSION=$(echo $CORDOVA_VERSION | cut -c 1-1)
+CORDOVA_MAJOR_VERSION=`expr "$CORDOVA_VERSION" : '\\~\?\\^\?\([[:digit:]]\+\)'`
 
 if [[ "$CORDOVA_MAJOR_VERSION" == "6" ]]; then
   FETCH_COMMAND="--fetch"