Skip to content

Commit

Permalink
Update older macOS GitHub Actions runner to 13
Browse files Browse the repository at this point in the history
- Update OpenAL-soft to 1.24.1
- Preserve CMAKE_OSX_ARCHITECTURES variable quotes in macOS workflow
  • Loading branch information
encelo committed Dec 12, 2024
1 parent 9378de7 commit 5fe7f4d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macOS-12, macOS-14]
os: [macOS-13, macOS-14]
BuildType: [Debug, Release]

runs-on: ${{ matrix.os }}
Expand All @@ -27,10 +27,10 @@ jobs:
- name: 'CMake Configuration'
run: |
if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
export OSX_ARCHITECTURES="arm64;x86_64"
export OSX_ARCHITECTURES='"arm64;x86_64"'
fi
cmake -B ../nCine-libraries-build -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D CMAKE_OSX_ARCHITECTURES=$OSX_ARCHITECTURES
cmake -B ../nCine-libraries-build -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} #-D CMAKE_OSX_ARCHITECTURES=$OSX_ARCHITECTURES
- name: 'Make'
run: |
Expand All @@ -50,7 +50,7 @@ jobs:
if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
export OS=macos14
else
export OS=macos12
export OS=macos13
fi
export CC=appleclang
Expand Down
6 changes: 3 additions & 3 deletions cmake/openal-soft.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(TARGET_OPENAL openal)
set(URL_OPENAL https://github.com/kcat/openal-soft/archive/1.24.0.tar.gz)
set(URL_MD5_OPENAL 9bf204aa3580b35fb27604484f51c6e0)
set(URL_OPENAL https://github.com/kcat/openal-soft/archive/1.24.1.tar.gz)
set(URL_MD5_OPENAL f57dd15086366fc7d73966b8cfde5fe9)
set(COMMON_CMAKE_ARGS_OPENAL -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL_CONFIG=OFF)

if(MSVC)
Expand All @@ -19,7 +19,7 @@ if(MSVC)
)
elseif(APPLE)
set(FRAMEWORK_DIR_OPENAL ${DESTINATION_PATH}/${TARGET_OPENAL}.framework)
set(DYLIBNAME_OPENAL libopenal.1.24.0.dylib)
set(DYLIBNAME_OPENAL libopenal.1.24.1.dylib)

ExternalProject_Add(project_${TARGET_OPENAL}
URL ${URL_OPENAL}
Expand Down

0 comments on commit 5fe7f4d

Please sign in to comment.