[whimsy] branch master updated: No need for local checkout of calendar.mdtext

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new b5511d1  No need for local checkout of calendar.mdtext
b5511d1 is described below

commit b5511d1f5aea7dc57ad7b7bfdaf0a722c543ad53
Author: Sebb <se...@apache.org>
AuthorDate: Tue Jul 7 22:50:59 2020 +0100

    No need for local checkout of calendar.mdtext
---
 www/board/agenda/views/actions/publish.json.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/board/agenda/views/actions/publish.json.rb b/www/board/agenda/views/actions/publish.json.rb
index ad5adc1..ec1e8d3 100755
--- a/www/board/agenda/views/actions/publish.json.rb
+++ b/www/board/agenda/views/actions/publish.json.rb
@@ -30,13 +30,11 @@ Publish approved minutes on the public web site
 require 'date'
 require 'whimsy/asf/svn'
 
-BOARD_SITE = ASF::SVN['site-board']
 MINUTES = ASF::SVN['minutes']
 BOARD_PRIVATE = ASF::SVN['foundation_board']
-CALENDAR = File.join(BOARD_SITE, 'calendar.mdtext')
 
 # update from svn
-[MINUTES, BOARD_SITE, BOARD_PRIVATE].each do |dir|
+[MINUTES, BOARD_PRIVATE].each do |dir|
   ASF::SVN.svn('cleanup', dir)
   ASF::SVN.svn('update', dir) # TODO: does this need auth?
 end
@@ -69,8 +67,8 @@ ASF::SVN.update MINUTES, @message, env, _ do |tmpdir|
   end
 end
 
-# Update the Calendar
-ASF::SVN.update CALENDAR, @message, env, _ do |tmpdir, calendar|
+# Update the Calendar from SVN
+ASF::SVN.multiUpdate_ ASF::SVN.svnpath!('site-board', 'calendar.mdtext' ), @message, env, _ do |calendar|
   # add year header
   unless calendar.include? "##{year}"
     calendar[/^()#.*Board meeting minutes #/,1] =