summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngy döt Net <ingy@ingy.net>2020-05-30 09:48:36 -0700
committerIngy döt Net <ingy@ingy.net>2020-05-31 09:31:11 -0700
commit55a405c42069b05b20c1e53d3ed8c099d4815095 (patch)
treec636137dcf61c0262512944c6f8f55027a76f545
parent9deee01508bb3b8ad25822f53d91d9f54eae9a0b (diff)
downloadlibyaml-git-master-2.tar.gz
Need newer bash and make for Macos testingmaster-2
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--Makefile.am4
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/$@