From 668ffb9cce09457731e7f8f8090b68cb628ec839 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 27 Nov 2024 18:54:50 +0100 Subject: [PATCH] Fix && in if statements --- .github/workflows/mcstas-basictest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 1ebc12ccd8..d73fa463dd 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -92,8 +92,8 @@ jobs: mkdir build_mcstas cd build_mcstas export EXTRA_ARGS_FOR_CMAKE="" - if [ "$RUNNER_OS" == "macOS" ]; then; if [ -d "/opt/homebrew/opt" ]; then; export HOMEBRW="/opt/homebrew/opt"; fi; fi; - if [ "$RUNNER_OS" == "macOS" ]; then; if [ -d "/usr/local/opt" ]; then; export HOMEBRW="/usr/local/opt"; fi; fi; + if [ "$RUNNER_OS" == "macOS" ] && [ -d "/opt/homebrew/opt" ]; then; export HOMEBRW="/opt/homebrew/opt"; fi + if [ "$RUNNER_OS" == "macOS" ] && [ -d "/usr/local/opt" ]; then; export HOMEBRW="/usr/local/opt"; fi if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex"; fi if [ "$RUNNER_OS" == "Linux" ]; then export EXTRA_ARGS_FOR_CMAKE="-DNEXUSLIB=/usr/lib -DNEXUSINCLUDE=/usr/include/nexus"; fi cmake \