From 6773ab145f5d24a6f6fbe27287a9a2d15e0f0b1e Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 27 Nov 2024 19:07:05 +0100 Subject: [PATCH] Sync McStas <-> McXtrace --- .github/workflows/mcxtrace-basictest.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml index 5bb002f134..f3f03250f8 100644 --- a/.github/workflows/mcxtrace-basictest.yml +++ b/.github/workflows/mcxtrace-basictest.yml @@ -22,6 +22,7 @@ jobs: - { os: ubuntu-24.04, CC: clang, CXX: clang++, python: '3.12' } - { os: ubuntu-22.04, CC: clang, CXX: clang++, python: '3.11' } - { os: ubuntu-22.04, CC: gcc-12, CXX: g++-12, python: '3.11' } + - { os: macos-13, CC: clang, CXX: clang++, python: "3.11" } - { os: macos-14, CC: clang, CXX: clang++, python: "3.12" } - { os: macos-15, CC: clang, CXX: clang++, python: "3.13" } - { os: windows-latest, CC: gcc, CXX: g++, python: "3.12" } @@ -91,9 +92,9 @@ jobs: mkdir build_mcxtrace cd build_mcxtrace export EXTRA_ARGS_FOR_CMAKE="" - if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex"; fi - if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex"; fi - if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex"; fi + if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; fi + if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; 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 \ -DCMAKE_INSTALL_PREFIX=../install_mcxtrace \