diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 56783b8f4..44dda7ef8 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -103,7 +103,7 @@ jobs: FHEROES2_WITH_TSAN: ON - name: macOS SDL2 on: [ 'pull_request', 'push' ] - os: macos-14 + os: macos-26-intel arch: x86_64 dependencies: sdl2 sdl2_mixer sdl2_image env: @@ -165,11 +165,6 @@ jobs: - name: Install dependencies (macOS) if: ${{ contains( matrix.on, github.event_name ) && startsWith( matrix.os, 'macos-' ) }} run: | - if [[ "${{ matrix.arch }}" == x86_64 ]]; then - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - # Homebrew uses /opt/homebrew for Apple Silicon packages and /usr/local for x86_64 packages - export PATH=/usr/local/bin:$PATH - fi brew install ${{ matrix.dependencies }} env: # Do not update outdated dependencies of installed packages @@ -182,10 +177,6 @@ jobs: - name: Build (MacOS) if: ${{ contains( matrix.on, github.event_name ) && startsWith( matrix.os, 'macos-' ) }} run: | - if [[ "${{ matrix.arch }}" == x86_64 ]]; then - # Homebrew uses /opt/homebrew for Apple Silicon packages and /usr/local for x86_64 packages - export PATH=/usr/local/bin:$PATH - fi make -j "$(sysctl -n hw.logicalcpu)" env: ${{ matrix.env }} - name: Create packages