Update macos-ci.yml

stephengtuggy · Dec 22, 2024 · 953fd7d · 953fd7d
1 parent 21c4fe8
commit 953fd7d
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
@@ -21,8 +21,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          #- macos-11
-          - macos-12
+          - macos-13
+          # - macos-14
         compiler:
           - clang
           - gcc
@@ -43,10 +43,15 @@ jobs:
       # - git
       # - jpeg
       # - libpng
-      # - libvorbis
+      # - ~libvorbis~
       # - python
+      - name: Setup Python
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        with:
+          python-version: 3.12.8
+
       - name: Install dependencies using homebrew
-        run: brew install boost-python3 gtk+3 gtkglext sdl
+        run: brew install boost-python3 gtk+3 gtkglext sdl2 libvorbis
 
       # The following Apple-provided libraries are deprecated:
       # * OpenGL as of macOS 10.14
@@ -55,18 +60,16 @@ jobs:
         if: ${{ matrix.homebrew-gl }}
         run: |
           brew install mesa mesa-glu freeglut
-          ln -s /usr/local/include/GL /usr/local/include/OpenGL
-          ln -s /usr/local/include/GL /usr/local/include/GLUT
-        # ln -s /usr/local/lib/libGL.dylib /usr/local/lib/libOpenGL.dylib
-        # find /usr/local/lib/ -iname '*gl*.dylib'
+          ln -s "$(brew --prefix)/include/GL" "$(brew --prefix)/include/OpenGL"
+          ln -s "$(brew --prefix)/include/GL" "$(brew --prefix)/include/GLUT"
 
       # The Apple-provided OpenAL is deprecated as of macOS 10.15
       - name: Optionally install homebrewed OpenAL
         if: ${{ matrix.homebrew-al }}
         run: brew install openal-soft
 
       - name: Check out repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
           submodules: false
@@ -81,7 +84,7 @@ jobs:
           MY_OS_NAME: macos
           COMPILER:   ${{ matrix.compiler }}
           FLAGS:      -DCMAKE_FIND_FRAMEWORK=LAST
-          OPENALDIR:  "/usr/local/opt/openal-soft"
+          OPENALDIR:  "$(brew --prefix)/opt/openal-soft"
         run: script/cibuild $FLAGS
 
       - name: Test