From 34aea91a7c0998d31c90f5d666350af861ef343f Mon Sep 17 00:00:00 2001 From: Mikkel Tygesen Date: Sun, 1 Feb 2026 22:56:13 +0100 Subject: [PATCH 1/2] potential workflow fix for mac --- .github/workflows/build-macos-arm.yml | 7 +++++++ .github/workflows/build-macos.yml | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos-arm.yml b/.github/workflows/build-macos-arm.yml index e1d10bb..a4e8c7b 100644 --- a/.github/workflows/build-macos-arm.yml +++ b/.github/workflows/build-macos-arm.yml @@ -24,9 +24,16 @@ jobs: brew install flex bison curl -L https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8-macos-universal.tar.gz -o cmake.tar.gz tar -xzf cmake.tar.gz +<<<<<<< Updated upstream sudo mv cmake-3.31.8-macos-universal/CMake.app/Contents/bin/* /usr/local/bin/ sudo cp -r cmake-3.31.8-macos-universal/CMake.app/Contents/share /usr/local/ cmake --version +======= + sudo mv cmake-3.31.8-macos-universal/CMake.app /Applications/ + export PATH="/Applications/CMake.app/Contents/bin:$PATH" + cmake --version + echo "/Applications/CMake.app/Contents/bin" >> $GITHUB_PATH +>>>>>>> Stashed changes - name: Prebuild run: | diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index df825d0..fbd795f 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -35,9 +35,10 @@ jobs: brew install flex bison curl -L https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8-macos-universal.tar.gz -o cmake.tar.gz tar -xzf cmake.tar.gz - sudo mv cmake-3.31.8-macos-universal/CMake.app/Contents/bin/* /usr/local/bin/ - sudo cp -r cmake-3.31.8-macos-universal/CMake.app/Contents/share /usr/local/ + sudo mv cmake-3.31.8-macos-universal/CMake.app /Applications/ + export PATH="/Applications/CMake.app/Contents/bin:$PATH" cmake --version + echo "/Applications/CMake.app/Contents/bin" >> $GITHUB_PATH - name: Prebuild run: | From 59d562d48b94344100c636d4eed7d6b8d3383647 Mon Sep 17 00:00:00 2001 From: Mikkel Tygesen Date: Sun, 1 Feb 2026 22:57:19 +0100 Subject: [PATCH 2/2] fix merge --- .github/workflows/build-macos-arm.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build-macos-arm.yml b/.github/workflows/build-macos-arm.yml index a4e8c7b..af3ae6b 100644 --- a/.github/workflows/build-macos-arm.yml +++ b/.github/workflows/build-macos-arm.yml @@ -24,16 +24,10 @@ jobs: brew install flex bison curl -L https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8-macos-universal.tar.gz -o cmake.tar.gz tar -xzf cmake.tar.gz -<<<<<<< Updated upstream - sudo mv cmake-3.31.8-macos-universal/CMake.app/Contents/bin/* /usr/local/bin/ - sudo cp -r cmake-3.31.8-macos-universal/CMake.app/Contents/share /usr/local/ - cmake --version -======= sudo mv cmake-3.31.8-macos-universal/CMake.app /Applications/ export PATH="/Applications/CMake.app/Contents/bin:$PATH" cmake --version echo "/Applications/CMake.app/Contents/bin" >> $GITHUB_PATH ->>>>>>> Stashed changes - name: Prebuild run: |