From 55a405c42069b05b20c1e53d3ed8c099d4815095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= Date: Sat, 30 May 2020 09:48:36 -0700 Subject: Need newer bash and make for Macos testing --- .github/workflows/main.yml | 4 +++- Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bc3941..c2bdef4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,9 @@ jobs: - name: Install software run: | if [[ '${{ matrix.os }}' == macOS-latest ]]; then - brew install automake coreutils + brew install automake bash coreutils make + echo ::add-path::/usr/local/opt/coreutils/libexec/gnubin + echo ::add-path::/usr/local/opt/make/libexec/gnubin fi - name: Fetch branches run: | diff --git a/Makefile.am b/Makefile.am index 95f2faa..644a17d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,9 +31,9 @@ test-suite: tests/run-test-suite all test-all: test test-suite tests/run-test-suite: - -git branch --track run-test-suite origin/run-test-suite + -git branch --track run-test-suite-2 origin/run-test-suite-2 -git worktree prune - git worktree add $@ run-test-suite + git worktree add $@ run-test-suite-2 packaging: -git branch --track $@ origin/$@ -- cgit v1.2.1