From f4d2f058445543e61d84a6bde6eb8ec083d75607 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Fri, 27 Feb 2026 11:06:55 +0100 Subject: [PATCH 1/2] Use commit date instead of author date and improve trace of what happened --- scripts/schema-publish.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/schema-publish.sh b/scripts/schema-publish.sh index 764e73a8f0..cdf907204c 100755 --- a/scripts/schema-publish.sh +++ b/scripts/schema-publish.sh @@ -42,24 +42,27 @@ publish_schema() { # rename or create the jekyll lander markdown file for this iteration if [ ! -z "$jekyllLander" ]; then - mv $jekyllLander $target.md - echo " * $newestCommitDate: $schema & jekyll lander $(basename $jekyllLander)" + if [ "$jekyllLander" = "$target.md" ]; then + echo " * $base did not change since $date" + else + mv $jekyllLander $target.md + echo " * $base: $date added & jekyll lander moved from $(basename $jekyllLander)" + fi else # find the most recent preceding version local lastdir=""; for fn in $(dirname $deploydir)/?.?; do test "$fn" "<" "$deploydir" && lastdir="$fn"; done local lastVersion=$(basename $lastdir) # find the jekyll lander markdown file for the preceding version - local lastLander=$(find "$lastdir/$base" -maxdepth 1 -name "*.md") + local lastLander=$(find "$lastdir/$base" -maxdepth 1 -name "*.md" 2>/dev/null) if [ ! -z "$lastLander" ]; then # copy and adjust the lander file from the preceding version sed "s/$lastVersion/$version/g" $lastLander > $target.md - echo " * $newestCommitDate: $schema & jekyll lander $(basename $lastLander) of $lastVersion" + echo " * $base: $date added & jekyll lander copied from $(basename $lastLander) of $lastVersion" else - echo " * $newestCommitDate: $schema" + echo " * $base: $date added" fi fi - } echo === Building schemas into $deploydir @@ -72,7 +75,7 @@ maxDate="" sedCmds=() for schema in "${schemas[@]}"; do if [ -f "$schemaDir/$schema" ]; then - newestCommitDate=$(git log -1 --format="%ad" --date=short "$schemaDir/$schema") + newestCommitDate=$(git log -1 --format="%cd" --date=short "$schemaDir/$schema") # the newest date across a schema and all its dependencies is its date stamp if [ "$newestCommitDate" \> "$maxDate" ]; then From 489d057f36eb64ab04ba3ecc3802c0cf5ded7abb Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Tue, 10 Mar 2026 21:05:45 +0100 Subject: [PATCH 2/2] Ten seconds apparently is not enough Better wait a minute. --- .github/workflows/sync-dev-to-vX.Y-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-dev-to-vX.Y-dev.yaml b/.github/workflows/sync-dev-to-vX.Y-dev.yaml index 76b399b9aa..972673a675 100644 --- a/.github/workflows/sync-dev-to-vX.Y-dev.yaml +++ b/.github/workflows/sync-dev-to-vX.Y-dev.yaml @@ -63,7 +63,7 @@ jobs: --body "Merge relevant changes from \`$HEAD\` into \`$BASE\`.") echo "" echo "PR to sync $BASE with $HEAD: $PR" - sleep 10 # allow status checks to be triggered + sleep 60 # allow status checks to be triggered gh pr checks $PR --watch --required || continue gh pr merge $PR --merge --admin