From e0ec480e4fe1a1505d60584c77e61276a0026535 Mon Sep 17 00:00:00 2001 From: Jens Maurer Date: Mon, 16 Jun 2025 19:23:23 +0200 Subject: [PATCH] [check] Fix MacOS build by sorting all input files for the comparison This makes us independent from any particular sort order a tool might prefer. --- .github/workflows/check.yml | 2 +- tools/check-output.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 47f9248da0..e6fa6d7203 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -18,7 +18,7 @@ jobs: matrix: cfg: - { name: 'Linux', os: 'ubuntu-24.04' } - # - { name: 'MacOS', os: 'macos-15' } + - { name: 'MacOS', os: 'macos-15' } steps: - name: checkout diff --git a/tools/check-output.sh b/tools/check-output.sh index ccae6b348b..b317116bb9 100755 --- a/tools/check-output.sh +++ b/tools/check-output.sh @@ -91,7 +91,7 @@ done function indexentries() { sed 's,\\glossaryentry{\(.*\)@.*,\1,' "$1" | LANG=C sort; } function removals() { diff -u "$1" "$2" | grep '^-' | grep -v '^---' | sed 's/^-//'; } function difference() { diff -u "$1" "$2" | grep '^[-+]' | grep -v '^\(---\|+++\)'; } -XREFDELTA="$(difference <(indexentries xrefdelta.glo) <(removals <(cat xrefprev) <(indexentries xrefindex.glo)))" +XREFDELTA="$(difference <(indexentries xrefdelta.glo) <(removals <(LANG=C sort < xrefprev) <(indexentries xrefindex.glo)))" if [ -n "$XREFDELTA" ]; then echo "incorrect entries in xrefdelta.tex:" >&2 echo "$XREFDELTA" | sed 's,^-,spurious ,; s,^+,missing ,;' >&2