From 6abe3bb32debb85d141c70e157ea3ba5b415ddce Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Tue, 5 Mar 2024 15:14:12 -0800 Subject: [PATCH] Fix homebrew path Homebrew changed it's default install path from `/usr/local` to `/opt/homebrew` a while back. Hardcoding the path is a bad idea, so instead use `$(brew --prefix)` to get the prefix of the path for tools. Also fix some [shellcheck](https://github.com/koalaman/shellcheck) issues. Signed-off-by: Bryan Hundven --- .github/workflows/continuous-integration-workflow.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index c25235bdda..48907a9101 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -26,12 +26,15 @@ jobs: - name: "build ct-ng" run: | if [ "$RUNNER_OS" == "macOS" ]; then - export PATH="$PATH:/usr/local/opt/binutils/bin" - export CPPFLAGS="-I/usr/local/opt/ncurses/include -I/usr/local/opt/gettext/include" - export LDFLAGS="-L/usr/local/opt/ncurses/lib -L/usr/local/opt/gettext/lib" + PATH="$PATH:$(brew --prefix)/opt/binutils/bin" + export PATH + CPPFLAGS="-I$(brew --prefix)/opt/ncurses/include -I$(brew --prefix)/opt/gettext/include" + export CPPFLAGS + LDFLAGS="-L$(brew --prefix)/opt/ncurses/lib -L$(brew --prefix)/opt/gettext/lib" + export LDFLAGS fi ./bootstrap - ./configure --prefix=$PWD/.local/ + ./configure --prefix="$PWD/.local/" make make install tar -cf ct-ng.tar .local/