Browse Source

Merge pull request #61 from weseek/master

release v1.1.3 (retry)
Yuki Takei 9 years ago
parent
commit
7993d82604
3 changed files with 5 additions and 15 deletions
  1. 2 2
      README.md
  2. 2 0
      wercker.yml
  3. 1 13
      yarn.lock

+ 2 - 2
README.md

@@ -102,10 +102,10 @@ Getting Started to Develop
     v6.10.0
     
     $ npm -v
-    4.5.0
+    4.6.1
     
     $ yarn --version
-    0.21.3
+    0.24.5
     ```
 
 ## Build and Running the app

+ 2 - 0
wercker.yml

@@ -102,6 +102,8 @@ release: # would be run on release branch
       name: bump version
       code: |
         sh ./bin/wercker/init-git.sh
+        # git reset
+        git reset --hard
         # npm version to bump version
         npm version patch
         # get version

+ 1 - 13
yarn.lock

@@ -4909,7 +4909,7 @@ readable-stream@1.1.x, readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@2.2.7:
+readable-stream@2.2.7, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.7.tgz#07057acbe2467b22042d36f98c5ad507054e95b1"
   dependencies:
@@ -4921,18 +4921,6 @@ readable-stream@2.2.7:
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
-  dependencies:
-    buffer-shims "~1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~1.0.0"
-    util-deprecate "~1.0.1"
-
 readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"