ci: Update macOS CI config.

SFTtech · Oct 14, 2024 · a66e08b · a66e08b
1 parent 8d5629a
commit a66e08b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/.github/workflows/macosx-ci.yml b/.github/workflows/macosx-ci.yml
@@ -5,7 +5,7 @@ jobs:
   # https://docs.github.com/en/actions/reference/software-installed-on-github-hosted-runners
   # we install stuff not already there
   macos-build:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -40,26 +40,14 @@ jobs:
         run: brew update-reset
       - name: Brew update
         run: brew update
-      - name: Install clang / LLVM 15.0.0
-        run: |
-          set -x
-          brew install --force wget
-          mkdir -p /tmp/clang
-          cd /tmp/clang
-          wget https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0/clang+llvm-15.0.0-x86_64-apple-darwin.tar.xz -O clang-15.0.0.tar.xz
-          ls
-          tar -xvf clang-15.0.0.tar.xz -C ~
-          cd ~
-          mv clang+llvm-15.0.0-x86_64-apple-darwin clang-15.0.0
-          ~/clang-15.0.0/bin/clang++ --version
       - name: Brew install DeJaVu fonts
         run: brew install --cask font-dejavu
-      - name: Remove python's 2to3 link so that 'brew link' does not fail
-        run: rm /usr/local/bin/2to3* && rm /usr/local/bin/idle3*
       - name: Install environment helpers with homebrew
         run: brew install --force ccache
-      - name: Install dependencies with homebrew
-        run: brew install --force libepoxy freetype fontconfig harfbuzz opus opusfile qt6 libogg libpng toml11 eigen
+      - name: Install LLVM with homebrew
+        run: brew install --force llvm
+      - name: Install openage dependencies with homebrew
+        run: brew install --force cmake python3 libepoxy freetype fontconfig harfbuzz opus opusfile qt6 libogg libpng toml11 eigen
       - name: Install nyan dependencies with homebrew
         run: brew install --force flex make
       - name: Install python3 packages
@@ -68,9 +56,7 @@ jobs:
         # numpy pulls gcc as dep? and pygments doesn't work.
         run: pip3 install --upgrade --break-system-packages cython numpy mako lz4 pillow pygments setuptools toml
       - name: Configure
-        run: |
-          CLANG_PATH="$HOME/clang-15.0.0/bin/clang++"
-          ./configure --compiler="$CLANG_PATH" --mode=debug --ccache --download-nyan
+        run: ./configure --compiler="$(brew --prefix llvm)/bin/clang++" --mode=release --ccache --download-nyan
       - name: Build
         run: make -j$(sysctl -n hw.logicalcpu) VERBOSE=1
       - name: Test

diff --git a/doc/build_instructions/macos.md b/doc/build_instructions/macos.md
@@ -38,8 +38,7 @@ We advise against using the clang version that comes with macOS (Apple Clang) as
 ```
 # on Intel macOS, llvm is by default in /usr/local/Cellar/llvm/bin/
 # on ARM macOS, llvm is by default in /opt/homebrew/Cellar/llvm/bin/
-CLANG_PATH="<homebrew llvm install path>/bin/clang++"
-./configure --compiler="$CLANG_PATH" --download-nyan
+./configure --compiler="$(brew --prefix llvm)/bin/clang"" --download-nyan
 ```
 
 Afterwards, trigger the build using `make`: