cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cordova-lib git commit: CB-11980: updated travis and appveyor
Date Wed, 07 Jun 2017 21:15:06 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master cef2959c8 -> 0df9554ae


CB-11980: updated travis and appveyor


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/0df9554a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/0df9554a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/0df9554a

Branch: refs/heads/master
Commit: 0df9554ae790f16b40b8aad386284bf7d10587f4
Parents: cef2959
Author: Steve Gill <stevengill97@gmail.com>
Authored: Wed Jun 7 13:57:28 2017 -0700
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Wed Jun 7 14:15:55 2017 -0700

----------------------------------------------------------------------
 .travis.yml                                     |  13 +-
 appveyor.yml                                    |  12 +-
 .../plugins/recursivePlug/demo/fetch.json       | 129 -------------------
 .../plugins/recursivePlug/demo/test-recursive   |   1 -
 4 files changed, 12 insertions(+), 143 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0df9554a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index decc6d7..f4a49b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,17 +10,16 @@ install:
   - git clone https://github.com/apache/cordova-fetch --depth 10
   - git clone https://github.com/apache/cordova-serve --depth 10
   - git clone https://github.com/apache/cordova-common --depth 10
-  - npm link cordova-js
-  - npm link cordova-common
-  - npm link cordova-serve
-  - (cd cordova-fetch && npm link ../cordova-common && npm install)
-  - npm link cordova-fetch
+  - (cd cordova-js && npm install && npm link .)
+  - (cd cordova-common && npm install && npm link .)
+  - (cd cordova-serve && npm install && npm link .)
+  - (cd cordova-fetch && npm link cordova-common && npm install &&
npm link .)
   - npm install
   # Workaround for npm/npm#10343 when dependency of linked module is moved to dependent
   # module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli' dependency
   # is moved to 'cordova-lib' and hence 'npm run jshint' on 'cordova-common' is failing
-  - "(cd cordova-common && npm install)"
-  - (cd cordova-fetch && npm install && npm link ../cordova-common)
+  #- "(cd cordova-common && npm install)"
+  #- (cd cordova-fetch && npm install && npm link ../cordova-common)
 
 script:
   - "npm run e2e-tests"

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0df9554a/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index e55b8a1..fa6dd0f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,12 +24,12 @@ install:
   # Workaround for npm/npm#10343 when dependency of linked module is moved to dependent
   # module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli' dependency
   # is moved to 'cordova-lib' and hence 'npm run jshint' on 'cordova-common' is failing
-  - cd cordova-common
-  - npm install
-  - cd ../cordova-fetch
-  - npm install
-  - npm link ../cordova-common
-  - cd ../
+  #- cd cordova-common
+  #- npm install
+  #- cd ../cordova-fetch
+  #- npm install
+  #- npm link ../cordova-common
+  #- cd ../
 
 build: off
 

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0df9554a/spec-plugman/plugins/recursivePlug/demo/fetch.json
----------------------------------------------------------------------
diff --git a/spec-plugman/plugins/recursivePlug/demo/fetch.json b/spec-plugman/plugins/recursivePlug/demo/fetch.json
deleted file mode 100644
index 24e1589..0000000
--- a/spec-plugman/plugins/recursivePlug/demo/fetch.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "com.plugin.withhooks": {
-    "source": {
-      "type": "local",
-      "path": "/Users/steveng/repo/cordova/cordova-lib/spec-cordova/fixtures/plugins/com.plugin.withhooks"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "com.phonegap.plugins.childbrowser": {
-    "source": {
-      "type": "local",
-      "path": "/Users/steveng/repo/cordova/cordova-lib/spec-cordova/fixtures/plugins/test"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "cordova-plugin-camera": {
-    "source": {
-      "type": "registry",
-      "id": "cordova-plugin-camera"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "cordova-plugin-compat": {
-    "source": {
-      "type": "registry",
-      "id": "cordova-plugin-compat@^1.0.0"
-    },
-    "is_top_level": false,
-    "variables": {}
-  },
-  "cordova-plugin-whitelist": {
-    "source": {
-      "type": "registry",
-      "id": "cordova-plugin-whitelist@1"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "cordova-plugin-file": {
-    "source": {
-      "type": "registry",
-      "id": "cordova-plugin-file@^4.0.0"
-    },
-    "is_top_level": false,
-    "variables": {}
-  },
-  "org.test.defaultvariables": {
-    "source": {
-      "type": "local",
-      "path": "/Users/steveng/repo/cordova/cordova-lib/spec-cordova/fixtures/plugins/org.test.defaultvariables"
-    },
-    "is_top_level": true,
-    "variables": {
-      "REQUIRED": "yes",
-      "REQUIRED_ANDROID": "yes",
-      "DEFAULT": "yes",
-      "DEFAULT_ANDROID": "yes"
-    }
-  },
-  "cordova-plugin-device": {
-    "source": {
-      "type": "git",
-      "url": "http://github.com/apache/cordova-plugin-device.git",
-      "subdir": ".",
-      "ref": "r1.0.0"
-    },
-    "variables": {}
-  },
-  "org.apache.cordova.console": {
-    "source": {
-      "type": "registry",
-      "id": "cordova-plugin-console@0.2.11"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "cordova-plugin-facebook4": {
-    "source": {
-      "type": "git",
-      "url": "https://github.com/jeduan/cordova-plugin-facebook4",
-      "subdir": "."
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "org.apache.cordova.fakeplugin1": {
-    "source": {
-      "type": "local",
-      "path": "/Users/steveng/repo/cordova/cordova-lib/spec-cordova/fixtures/plugins/fake1"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "cordova-plugin-console": {
-    "source": {
-      "type": "registry",
-      "id": "cordova-plugin-console@1.0.0"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "cordova-plugin-globalization": {
-    "source": {
-      "type": "registry",
-      "id": "@test-scope/cordova-plugin-globalization@~1.0.2"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
-  "org.apache.cordova.device": {
-    "source": {
-      "type": "git",
-      "url": "http://github.com/apache/cordova-plugin-device.git",
-      "subdir": ".",
-      "ref": "cdvtest"
-    },
-    "variables": {}
-  },
-  "test-recursive": {
-    "source": {
-      "type": "local",
-      "path": "/Users/steveng/repo/cordova/cordova-lib/spec-plugman/plugins/recursivePlug"
-    },
-    "variables": {}
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0df9554a/spec-plugman/plugins/recursivePlug/demo/test-recursive
----------------------------------------------------------------------
diff --git a/spec-plugman/plugins/recursivePlug/demo/test-recursive b/spec-plugman/plugins/recursivePlug/demo/test-recursive
deleted file mode 120000
index 0b606fd..0000000
--- a/spec-plugman/plugins/recursivePlug/demo/test-recursive
+++ /dev/null
@@ -1 +0,0 @@
-/Users/steveng/repo/cordova/cordova-lib/spec-plugman/plugins/recursivePlug
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message