whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Match needs to be more specific
Date Wed, 12 Aug 2020 10:13:39 GMT
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 e7c305e  Match needs to be more specific
e7c305e is described below

commit e7c305e1079be43f0db9f8e83079296144d2f0ec
Author: Sebb <sebb@apache.org>
AuthorDate: Wed Aug 12 11:13:28 2020 +0100

    Match needs to be more specific
    
    Add sample contents.
    These show that ##{year} appears elsewhere
---
 www/board/agenda/views/actions/publish.json.rb | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/www/board/agenda/views/actions/publish.json.rb b/www/board/agenda/views/actions/publish.json.rb
index 82ac0a0..e06d9e2 100755
--- a/www/board/agenda/views/actions/publish.json.rb
+++ b/www/board/agenda/views/actions/publish.json.rb
@@ -67,10 +67,32 @@ ASF::SVN.update MINUTES, @message, env, _ do |tmpdir|
   end
 end
 
+# Sample of the calendar.mdtext layout
+#
+# Title: ...
+# Notice: AL2.0
+#
+# Introductory paragraph...
+#
+# [2020](calendar.html#2020) |
+# ...
+# [Pre-organization meetings](calendar-1999-2004.html#preorg)
+#
+# # 2020 Board meeting minutes # {#2020}
+#
+# - [17 June 2020](../records/minutes/2020/board_minutes_2020_06_17.txt)
+#     * ...
+#     * ...
+#
+# - [20 May 2020](../records/minutes/2020/board_minutes_2020_05_20.txt)
+#     * ...
+#
+# ...
+
 # Update the Calendar from SVN
 ASF::SVN.update ASF::SVN.svnpath!('site-board', 'calendar.mdtext' ).untaint, @message, env,
_ do |calendar|
   # add year header
-  unless calendar.include? "##{year}"
+  unless calendar.include? "# #{year} Board meeting minutes"
     calendar[/^()#.*Board meeting minutes #/,1] =
       "# #{year} Board meeting minutes # {##{year}}\n\n"
   end


Mime
View raw message