Skip to content

Commit 181e8a1

Browse files
committed
Be patch tolerent for test environments.
1 parent 5898527 commit 181e8a1

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@ before_install:
104104
- if [[ "$CORDOVA_PLATFORM" == "android" ]]; then yes | sdkmanager "build-tools;26.0.0" "platforms;android-26" ; fi
105105

106106
script:
107-
- bash ./test/test-default.sh $CORDOVA_VERSION $CORDOVA_PLATFORM $CORDOVA_PLATFORM_VERSION
108-
- 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
107+
- bash ./test/test-default.sh ~$CORDOVA_VERSION $CORDOVA_PLATFORM ~$CORDOVA_PLATFORM_VERSION
108+
- 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

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
3636
3737
38-
"test:[email protected]:[email protected]": "bash ./test/test-default.sh 6.5.0 ios 4.5.4",
39-
"test:[email protected]:[email protected]": "bash ./test/test-default.sh 7.1.0 ios 4.5.4",
40-
"test:[email protected]:[email protected]": "bash ./test/test-default.sh 8.0.0 ios 4.5.4",
41-
"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",
42-
"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",
43-
"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",
44-
"test:[email protected]:[email protected]": "bash ./test/test-default.sh 6.5.0 browser 5.0.3",
45-
"test:[email protected]:[email protected]": "bash ./test/test-default.sh 7.1.0 browser 5.0.3",
46-
"test:[email protected]:[email protected]": "bash ./test/test-default.sh 8.0.0 browser 5.0.3"
38+
"test:[email protected]:[email protected]": "bash ./test/test-default.sh ~6.5.0 ios ~4.5.4",
39+
"test:[email protected]:[email protected]": "bash ./test/test-default.sh ~7.1.0 ios ~4.5.4",
40+
"test:[email protected]:[email protected]": "bash ./test/test-default.sh ~8.0.0 ios ~4.5.4",
41+
"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",
42+
"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",
43+
"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",
44+
"test:[email protected]:[email protected]": "bash ./test/test-default.sh ~6.5.0 browser ~5.0.3",
45+
"test:[email protected]:[email protected]": "bash ./test/test-default.sh ~7.1.0 browser ~5.0.3",
46+
"test:[email protected]:[email protected]": "bash ./test/test-default.sh ~8.0.0 browser ~5.0.3"
4747
},
4848
"dependencies": {}
4949
}

test/plugin-add.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PLUGIN=$4
1010
FOLDER=".build-$PLATFORM"
1111
cd $FOLDER
1212

13-
CORDOVA_MAJOR_VERSION=$(echo $CORDOVA_VERSION | cut -c 1-1)
13+
CORDOVA_MAJOR_VERSION=`expr "$CORDOVA_VERSION" : '\\~\?\\^\?\([[:digit:]]\+\)'`
1414

1515
if [[ "$CORDOVA_MAJOR_VERSION" == "6" ]]; then
1616
FETCH_COMMAND="--fetch"

0 commit comments

Comments
 (0)