From ef5b71496d73beec54a8005b5ec9f0837610a45e Mon Sep 17 00:00:00 2001 From: chrysle Date: Tue, 27 Jun 2023 09:49:02 +0200 Subject: [PATCH 1/3] Fix macOS tests --- todo.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/todo.sh b/todo.sh index fb8d4bc..437cfee 100755 --- a/todo.sh +++ b/todo.sh @@ -491,7 +491,14 @@ replaceOrPrepend() fixMissingEndOfLine() { # Parameters: $1: todo file; empty means $TODO_FILE. - sed -i.bak -e '$a\' "${1:-$TODO_FILE}" + #if [ "$OSTYPE" == "linux-gnu" ]; then + # sed -i.bak -e '$a\' "${1:-$TODO_FILE}" + #else + # sed -i '' -n p "${1:-$TODO_FILE}" + #f + todo_path="${1:-$TODO_FILE}" + [[ -f $todo_path ]] || echo "Not existing: $todo_path" + [[ -f $todo_path && $(tail -c1 "$todo_path") ]] && echo "" >> "$todo_path" } uppercasePriority() From b10904bb206948c5bc009180a201cccae4fd96b0 Mon Sep 17 00:00:00 2001 From: chrysle Date: Fri, 30 Jun 2023 15:11:44 +0200 Subject: [PATCH 2/3] Remove hacks --- todo.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/todo.sh b/todo.sh index 437cfee..f684421 100755 --- a/todo.sh +++ b/todo.sh @@ -491,13 +491,7 @@ replaceOrPrepend() fixMissingEndOfLine() { # Parameters: $1: todo file; empty means $TODO_FILE. - #if [ "$OSTYPE" == "linux-gnu" ]; then - # sed -i.bak -e '$a\' "${1:-$TODO_FILE}" - #else - # sed -i '' -n p "${1:-$TODO_FILE}" - #f todo_path="${1:-$TODO_FILE}" - [[ -f $todo_path ]] || echo "Not existing: $todo_path" [[ -f $todo_path && $(tail -c1 "$todo_path") ]] && echo "" >> "$todo_path" } From aa381535863288912acfca1b62db40a8bd031616 Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Fri, 30 Jun 2023 16:59:44 +0200 Subject: [PATCH 3/3] Housekeeping: Remove obsolete build platforms GitHub runners for Ubuntu 18.04 and MacOS 10.15 are not available any longer. --- .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 27fbeb5..4b173a0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: test: strategy: matrix: - platform: [ubuntu-20.04, ubuntu-18.04, macos-11, macos-10.15] + platform: [ubuntu-20.04, macos-11] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2