From 9d554928f21d0a5163e847d9c5dd2b338d892e38 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 18 Oct 2024 09:22:09 -0400 Subject: [PATCH] ENH: test for some expected build flags to be enabled across all platforms Re Windows and Servant -- not sure yet it should be asked: https://git-annex.branchable.com/forum/is_it_safe_to_enable_Servant_by_default__63__/#comment-c919d40111013cb3a6c2dcf76f12a09e --- .github/workflows/build-macos.yaml | 10 ++++++++++ .github/workflows/build-ubuntu.yaml | 10 ++++++++++ .github/workflows/build-windows.yaml | 10 ++++++++-- .github/workflows/template/build-{{ostype}}.yaml.j2 | 12 +++++++++--- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index fd3ee3befc..846612e763 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -216,6 +216,16 @@ jobs: - name: Install coreutils (for timeout) run: brew install coreutils + + - name: Check git-annex version for some expected build flags + run: | + # apparently order is not alphabetic, so cannot be relied upon for a single grep + flags=$(git annex version | grep 'build flags:') + for f in Assistant MagicMime Servant S3; do + echo -n "Checking for $f: " + echo "$flags" | grep --color "$f" || { echo "FAIL"; exit 1; } + done + - name: Print git-annex version run: git annex version diff --git a/.github/workflows/build-ubuntu.yaml b/.github/workflows/build-ubuntu.yaml index 2db7fb7276..3afa5d2b1f 100644 --- a/.github/workflows/build-ubuntu.yaml +++ b/.github/workflows/build-ubuntu.yaml @@ -271,6 +271,16 @@ jobs: run: | sudo dpkg -i git-annex*.deb + + - name: Check git-annex version for some expected build flags + run: | + # apparently order is not alphabetic, so cannot be relied upon for a single grep + flags=$(git annex version | grep 'build flags:') + for f in Assistant MagicMime Servant S3; do + echo -n "Checking for $f: " + echo "$flags" | grep --color "$f" || { echo "FAIL"; exit 1; } + done + - name: Print git-annex version run: git annex version diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index 910880b9dc..ded82c0cae 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -247,9 +247,15 @@ jobs: ls "$GIT_ANNEX_DIR"/*magic* "$GIT_ANNEX_DIR"/*gnurx* ls "$GIT_ANNEX_DIR"/../share/misc/*magic* - - name: Check git-annex version for MagicMime flag + + - name: Check git-annex version for some expected build flags run: | - git annex version | grep 'build flags:.*MagicMime' + # apparently order is not alphabetic, so cannot be relied upon for a single grep + flags=$(git annex version | grep 'build flags:') + for f in Assistant MagicMime Servant S3; do + echo -n "Checking for $f: " + echo "$flags" | grep --color "$f" || { echo "FAIL"; exit 1; } + done - name: Print git-annex version run: git annex version diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 775721d79e..444effa159 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -427,11 +427,17 @@ jobs: ls "$GIT_ANNEX_DIR"/*magic* "$GIT_ANNEX_DIR"/*gnurx* ls "$GIT_ANNEX_DIR"/../share/misc/*magic* - - name: Check git-annex version for MagicMime flag + {% endif %} + + - name: Check git-annex version for some expected build flags run: | - git annex version | grep 'build flags:.*MagicMime' + # apparently order is not alphabetic, so cannot be relied upon for a single grep + flags=$(git annex version | grep 'build flags:') + for f in Assistant MagicMime Servant S3; do + echo -n "Checking for $f: " + echo "$flags" | grep --color "$f" || { echo "FAIL"; exit 1; } + done - {% endif %} - name: Print git-annex version run: git annex version