From 8eb122833d4bcfdd00e8b50087e4a49644d959d9 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 11:18:52 +0200 Subject: [PATCH 1/7] Quick-fix: use same pinned version of MAINTAINERS.md for all 3.x specs --- scripts/md2html/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index 13f5fc82f7..758b7abdaa 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -10,7 +10,8 @@ mkdir -p deploy/js cd scripts/md2html mkdir -p history -git show c740e950d:MAINTAINERS.md > history/MAINTAINERS_v2.0.md +git show c740e95:MAINTAINERS.md > history/MAINTAINERS_v2.0.md +git show e9fe5bc:MAINTAINERS.md > history/MAINTAINERS_v3.x.md cp -p js/* ../../deploy/js 2> /dev/null cp -p markdown/* ../../deploy/ 2> /dev/null @@ -20,7 +21,7 @@ latest=`git describe --abbrev=0 --tags` latestCopied=none for filename in ../../versions/[3456789].*.md ; do version=$(basename "$filename" .md) - node md2html.js --respec --maintainers ../../MAINTAINERS.md ${filename} > ../../deploy/oas/v$version.html + node md2html.js --respec --maintainers ./history/MAINTAINERS_v3.x.md ${filename} > ../../deploy/oas/v$version.html if [ $version = $latest ]; then if [[ ${version} != *"rc"* ]];then # version is not a Release Candidate From 2c1750adceda6d0f5599104cbef1676cfc2bfe1e Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 11:45:41 +0200 Subject: [PATCH 2/7] Specific MAINTAINERS file per version --- scripts/md2html/build.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index 758b7abdaa..9139df7dc3 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -11,17 +11,22 @@ mkdir -p deploy/js cd scripts/md2html mkdir -p history git show c740e95:MAINTAINERS.md > history/MAINTAINERS_v2.0.md -git show e9fe5bc:MAINTAINERS.md > history/MAINTAINERS_v3.x.md +git show e9fe5bc:MAINTAINERS.md > history/MAINTAINERS_v3.0.0.md +cp history/MAINTAINERS_v3.0.0.md history/MAINTAINERS_v3.0.1.md +git show 3140640:MAINTAINERS.md > history/MAINTAINERS_v3.0.2.md +cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.0.3.md +cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.0.3.md +cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.1.0.md +# add lines for 3.0.4, 3.1.1, ... + cp -p js/* ../../deploy/js 2> /dev/null cp -p markdown/* ../../deploy/ 2> /dev/null -node md2html.js --respec --maintainers ./history/MAINTAINERS_v2.0.md ../../versions/2.0.md > ../../deploy/oas/v2.0.html - latest=`git describe --abbrev=0 --tags` latestCopied=none -for filename in ../../versions/[3456789].*.md ; do +for filename in ../../versions/[23456789].*.md ; do version=$(basename "$filename" .md) - node md2html.js --respec --maintainers ./history/MAINTAINERS_v3.x.md ${filename} > ../../deploy/oas/v$version.html + node md2html.js --respec --maintainers ./history/MAINTAINERS_v$version.md ${filename} > ../../deploy/oas/v$version.html if [ $version = $latest ]; then if [[ ${version} != *"rc"* ]];then # version is not a Release Candidate From 633e5794b5253837a6d39e1125d33fcb579bb119 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 11:54:54 +0200 Subject: [PATCH 3/7] Use oldest MAINTAINERS for 3.0.0 and 3.0.1 --- scripts/md2html/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index 9139df7dc3..22993bebf2 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -11,7 +11,7 @@ mkdir -p deploy/js cd scripts/md2html mkdir -p history git show c740e95:MAINTAINERS.md > history/MAINTAINERS_v2.0.md -git show e9fe5bc:MAINTAINERS.md > history/MAINTAINERS_v3.0.0.md +git show c740e95:MAINTAINERS.md > history/MAINTAINERS_v3.0.0.md cp history/MAINTAINERS_v3.0.0.md history/MAINTAINERS_v3.0.1.md git show 3140640:MAINTAINERS.md > history/MAINTAINERS_v3.0.2.md cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.0.3.md From 16c549a35244571425e670d02aa99a8ca4f338f4 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 13:10:36 +0200 Subject: [PATCH 4/7] Recreate maintainers in 2015 --- scripts/md2html/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index 22993bebf2..a0d1549896 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -10,7 +10,14 @@ mkdir -p deploy/js cd scripts/md2html mkdir -p history -git show c740e95:MAINTAINERS.md > history/MAINTAINERS_v2.0.md +cat > history/MAINTAINERS_v2.0.md < history/MAINTAINERS_v3.0.0.md cp history/MAINTAINERS_v3.0.0.md history/MAINTAINERS_v3.0.1.md git show 3140640:MAINTAINERS.md > history/MAINTAINERS_v3.0.2.md From 40ef508aadc34bb49c9f3b1143d431938cac2051 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 13:11:14 +0200 Subject: [PATCH 5/7] Update build.sh --- scripts/md2html/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index a0d1549896..b798e98f3c 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -17,7 +17,6 @@ cat > history/MAINTAINERS_v2.0.md < history/MAINTAINERS_v3.0.0.md cp history/MAINTAINERS_v3.0.0.md history/MAINTAINERS_v3.0.1.md git show 3140640:MAINTAINERS.md > history/MAINTAINERS_v3.0.2.md From f5988c39b6e9f63df37704b2c884a6281e72f18f Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 13:23:26 +0200 Subject: [PATCH 6/7] Fine-tune maintainers --- scripts/md2html/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index b798e98f3c..2c14cb3c5f 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -17,11 +17,10 @@ cat > history/MAINTAINERS_v2.0.md < history/MAINTAINERS_v3.0.0.md -cp history/MAINTAINERS_v3.0.0.md history/MAINTAINERS_v3.0.1.md +cp history/MAINTAINERS_v2.0.md history/MAINTAINERS_v3.0.0.md +git show c740e95:MAINTAINERS.md > history/MAINTAINERS_v3.0.1.md git show 3140640:MAINTAINERS.md > history/MAINTAINERS_v3.0.2.md cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.0.3.md -cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.0.3.md cp history/MAINTAINERS_v3.0.2.md history/MAINTAINERS_v3.1.0.md # add lines for 3.0.4, 3.1.1, ... From 428d7d7902613ddb101f937c1b3fe2ff754c4a9d Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Mon, 6 May 2024 14:01:11 +0200 Subject: [PATCH 7/7] Emeritus is the last bullet list Ignore additional lists "in the middle" --- scripts/md2html/md2html.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/md2html/md2html.js b/scripts/md2html/md2html.js index 147e33f62a..8920677f5a 100644 --- a/scripts/md2html/md2html.js +++ b/scripts/md2html/md2html.js @@ -118,7 +118,8 @@ function doMaintainers() { let t = $(this).text().split('@')[0]; maintainers.push({name:t}); }); - u = $('ul').eq(1); + if ($("ul").length < 2) return; + u = $("ul").last(); $(u).children('li').each(function(e){ let t = $(this).text().split('@')[0]; emeritus.push({name:t});