You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/08/19 16:26:02 UTC
[whimsy] branch master updated (47c455e -> 60506d1)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 47c455e Mention gitpubsub [ci skip]
new 91ba65c rerun npm install when package.json changes
new ed496b6 Merge branch 'master' of github.com:apache/whimsy
new 60506d1 ignore package.json
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/board/agenda/.gitignore | 1 +
www/board/agenda/Rakefile | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 03/03: ignore package.json
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 60506d1f47356af37dbf4cd35059a921270ddf89
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 12:25:51 2017 -0400
ignore package.json
---
www/board/agenda/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/www/board/agenda/.gitignore b/www/board/agenda/.gitignore
index 1041811..8211a4c 100644
--- a/www/board/agenda/.gitignore
+++ b/www/board/agenda/.gitignore
@@ -1,5 +1,6 @@
passenger.3000.*
test/work
Gemfile.lock
+package-lock.json
node_modules
.vagrant
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 01/03: rerun npm install when package.json changes
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 91ba65c6fe42d6ea12c2e39e55aea4977b37f1c2
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 12:25:04 2017 -0400
rerun npm install when package.json changes
---
www/board/agenda/Rakefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index f671ed3..4dfc5bc 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -39,7 +39,7 @@ task "touch" do
sh 'touch', File.expand_path('../tmp/restart.txt', __FILE__)
end
-file 'node_modules' do
+file 'package-lock.json' => 'package.json' do
sh 'npm install'
end
@@ -100,7 +100,7 @@ task :work => ['test/work/board',
*testfiles.map {|testfile| "test/work/data/#{testfile}.yml"}]
namespace :test do
- task :setup => [:reset, :work, 'node_modules']
+ task :setup => [:reset, :work, 'package-lock.json']
task :server => 'server:test'
task :stress => :setup do
@@ -193,4 +193,4 @@ end
# cleanup
require 'rake/clean'
CLEAN.include 'passenger.3000.*', 'test/work'
-CLOBBER.include 'node_modules'
+CLOBBER.include 'node_modules', 'package-lock.json'
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 02/03: Merge branch 'master' of github.com:apache/whimsy
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit ed496b657a68d43d392db379ae98d18e4bc20301
Merge: 91ba65c 47c455e
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 12:25:28 2017 -0400
Merge branch 'master' of github.com:apache/whimsy
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.