From edb3e210283c3856e40f4c3d42f1460743553382 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sat, 21 Dec 2024 16:04:37 -0800 Subject: [PATCH] Update macos-release.yml --- .github/workflows/macos-release.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index 3789cd50b..982aa5d17 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -23,8 +23,8 @@ jobs: fail-fast: false matrix: os: - #- macos-11 - - macos-12 + - macos-13 + # - macos-14 compiler: - clang - gcc @@ -47,8 +47,13 @@ jobs: # - libpng # - 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 sdl libvorbis # The following Apple-provided libraries are deprecated: # * OpenGL as of macOS 10.14 @@ -57,10 +62,8 @@ 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 @@ -68,7 +71,7 @@ jobs: run: brew install openal-soft - name: Check out repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 2 submodules: false @@ -88,7 +91,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" IS_RELEASE: 1 run: script/cibuild $FLAGS