Compare commits
No commits in common. "469922a4f8dbad03e01eaa4bedc426f9e5a1f701" and "15075495fe6772f6f73389929e1b18f00e6fd1e2" have entirely different histories.
469922a4f8
...
15075495fe
|
@ -8,7 +8,7 @@
|
||||||
*/
|
*/
|
||||||
function checkoutMaster ()
|
function checkoutMaster ()
|
||||||
{
|
{
|
||||||
echo shell_exec ("/usr/bin/git -C ../registry/ checkout master --quiet 2>&1");
|
echo shell_exec ("/usr/bin/git -C ../registry/ o master --quiet 2>&1");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -65,13 +65,13 @@ function writeBirdConfig ($roas)
|
||||||
$bird2_fq4 = fopen ('roa/bird4_route_dn42.conf', 'w');
|
$bird2_fq4 = fopen ('roa/bird4_route_dn42.conf', 'w');
|
||||||
$bird2_fq6 = fopen ('roa/bird6_route_dn42.conf', 'w');
|
$bird2_fq6 = fopen ('roa/bird6_route_dn42.conf', 'w');
|
||||||
|
|
||||||
fwrite ($bird1_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
fwrite ($bird1_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
||||||
fwrite ($bird1_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
fwrite ($bird1_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
||||||
fwrite ($bird1_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
fwrite ($bird1_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
||||||
|
|
||||||
fwrite ($bird2_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
fwrite ($bird2_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
||||||
fwrite ($bird2_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
fwrite ($bird2_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
||||||
fwrite ($bird2_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
fwrite ($bird2_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'"));
|
||||||
|
|
||||||
foreach ($roas["roas"] as $roa)
|
foreach ($roas["roas"] as $roa)
|
||||||
{
|
{
|
||||||
|
|
10
rfc8416.php
10
rfc8416.php
|
@ -7,11 +7,11 @@ require ("lib/functions.php");
|
||||||
|
|
||||||
// Define array() we are going to populate with data.
|
// Define array() we are going to populate with data.
|
||||||
$roas["slurmVersion"] = 1;
|
$roas["slurmVersion"] = 1;
|
||||||
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'");
|
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%H'");
|
||||||
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'");
|
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%p'");
|
||||||
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an <%ae>'");
|
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%an <%ae>'");
|
||||||
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'");
|
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%aD'");
|
||||||
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'");
|
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%s'");
|
||||||
$roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
|
$roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
|
||||||
$roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"];
|
$roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"];
|
||||||
$roas["validationOutputFilters"]["prefixFilters"] = array();
|
$roas["validationOutputFilters"]["prefixFilters"] = array();
|
||||||
|
|
10
roagen.php
10
roagen.php
|
@ -6,11 +6,11 @@ require ("lib/define.php");
|
||||||
require ("lib/functions.php");
|
require ("lib/functions.php");
|
||||||
|
|
||||||
// Define array() we are going to populate with data.
|
// Define array() we are going to populate with data.
|
||||||
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'");
|
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%H'");
|
||||||
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'");
|
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%p'");
|
||||||
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an <%ae>'");
|
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%an <%ae>'");
|
||||||
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'");
|
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%aD'");
|
||||||
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'");
|
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%s'");
|
||||||
$roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
|
$roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
|
||||||
$roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"];
|
$roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"];
|
||||||
|
|
||||||
|
|
|
@ -56,10 +56,7 @@ Note the gortr file is DateTime stamped only, it is not signed with any certific
|
||||||
## [Last merge commit][0] at [dn42 registry][1]
|
## [Last merge commit][0] at [dn42 registry][1]
|
||||||
|
|
||||||
\`\`\`
|
\`\`\`
|
||||||
$(git -C ../registry/ log -n 1 --date=iso8601 --merges |
|
$(git -C ../registry/ log -n 1 --merges | sed -E -e 's/^Author: ([a-zA-Z0-9]+) <.*>/Author: \1/' -e 's/^commit ([a-f0-9]+).*/commit \1/')
|
||||||
sed -E -e 's/^Author: ([a-zA-Z0-9]+) <.*>/Author: \1/' \
|
|
||||||
-e 's/^commit ([a-f0-9]+) .*/commit \1/' \
|
|
||||||
-e 's/[ ]+$//g' )
|
|
||||||
\`\`\`
|
\`\`\`
|
||||||
|
|
||||||
## crontab
|
## crontab
|
||||||
|
|
Loading…
Reference in a new issue