From a6d69811d4635cff91361a9092d7e0495f679d30 Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Sat, 21 Sep 2024 11:48:49 +0200 Subject: [PATCH 1/5] Bump: Build platforms to latest available: Ubuntu 24.04, MacOS 14 MacOS 11 is unsupported and the builds are just hanging due to the missing image. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4b173a09..df2109dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: test: strategy: matrix: - platform: [ubuntu-20.04, macos-11] + platform: [ubuntu-24.04, macos-14] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 From 75dc8cdaed89748e0ed4f8707e8201d062e8ff56 Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Sat, 21 Sep 2024 11:52:23 +0200 Subject: [PATCH 2/5] Bump: checkout action to v4 To silence this warning: > The following actions uses node12 which is deprecated and will be forced to run on node16: actions/checkout@v2 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index df2109dd..53e1ce71 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: platform: [ubuntu-24.04, macos-14] runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: make - run: make dist - run: make test From 26a82c3c2fda3c4285706b4684c060aadb6a5797 Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Sat, 21 Sep 2024 11:56:10 +0200 Subject: [PATCH 3/5] Build: ENH: Enable manual workflow run Helpful for testing. --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 53e1ce71..0d73c835 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,6 +5,7 @@ on: branches: [ master ] pull_request: branches: [ master ] + workflow_dispatch: # Allows you to run this workflow manually from the Actions tab jobs: test: From c2b3d01024bc6aa8d3c9142bc25140713e9a155f Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Sat, 21 Sep 2024 11:59:33 +0200 Subject: [PATCH 4/5] Build: ENH: Add dependabot configuration to offer updates to outdated GitHub actions This will automatically scan our workflow once a week and open PR(s) with updates to GitHub actions. --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..ca79ca5b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly From b00c212fcc585e8927c0aa9e561935a6ca9fe586 Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Sat, 21 Sep 2024 12:31:16 +0200 Subject: [PATCH 5/5] FIX: Regression: Compatibility: Bash on MacOS 12 does not support ${var^^} (after ca444e4) This went undetected because the CI/CD pipeline was broken again due to an outdated MacOS image. Continue to use tr for uppercasing. Enable pipefail so that grep (which needs to happen before the uppercasing) result is still considered. (This corrects commit ca444e40009efc28f50c9a9002e07c4cc1668955) --- todo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/todo.sh b/todo.sh index 7c43c1eb..026739a5 100755 --- a/todo.sh +++ b/todo.sh @@ -1346,8 +1346,8 @@ case $action in "listpri" | "lsp" ) shift ## was "listpri", new $1 is priority to list or first TERM - pri=$(printf "%s\n" "$1" | grep '^\([A-Za-z]\|[A-Za-z]-[A-Za-z]\|[A-Z][A-Z-]*[A-Z]\)$') && shift || pri="A-Z" - post_filter_command="${post_filter_command:-}${post_filter_command:+ | }grep '^ *[0-9]\+ ([${pri^^}]) '" + pri=$(set -o pipefail; printf "%s\n" "$1" | grep '^\([A-Za-z]\|[A-Za-z]-[A-Za-z]\|[A-Z][A-Z-]*[A-Z]\)$' | tr '[:lower:]' '[:upper:]') && shift || pri="A-Z" + post_filter_command="${post_filter_command:-}${post_filter_command:+ | }grep '^ *[0-9]\+ ([${pri}]) '" _list "$TODO_FILE" "$@" ;;