diff --git a/.github/workflows/macOS_arm64.yml b/.github/workflows/macOS_arm64.yml new file mode 100644 index 000000000..f31c479ac --- /dev/null +++ b/.github/workflows/macOS_arm64.yml @@ -0,0 +1,67 @@ +name: macOS arm64 + +on: + push: + branches: + - master + paths-ignore: + - '*.md' + - 'docs/**' + pull_request: + types: [opened, synchronize] + paths-ignore: + - '*.md' + - 'docs/**' + release: + types: [published] + paths-ignore: + - '*.md' + - 'docs/**' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: macos-14 + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + + - name: Create Build Environment + run: brew bundle install + + - name: Cache CMake build folder + uses: actions/cache@v4 + with: + path: build + key: ${{ github.workflow }}-v1-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v1- + + - name: Clean previous DMG + working-directory: ${{github.workspace}} + run: rm -f build/*.dmg + + - name: Build + working-directory: ${{github.workspace}} + shell: bash + env: + CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}} + run: | + cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DBUILD_TESTING=OFF \ + -DMACOSX_STANDALONE_APP_BUNDLE=ON && \ + cmake --build build -j $(sysctl -n hw.physicalcpu) --target package && \ + mv build/devilutionx.dmg build/devilutionx-arm64-macOS.dmg + + - name: Upload-Package + if: ${{ !env.ACT }} + uses: actions/upload-artifact@v4 + with: + name: devilutionx-arm64-macOS.dmg + path: build/devilutionx-arm64-macOS.dmg + + - name: Clean up artifacts + run: rm -rf build/_CPack_Packages build/*.dmg diff --git a/.github/workflows/macOS_x86_64.yml b/.github/workflows/macOS_x86_64.yml index c9e980fbf..72d5c2fc1 100644 --- a/.github/workflows/macOS_x86_64.yml +++ b/.github/workflows/macOS_x86_64.yml @@ -25,7 +25,7 @@ concurrency: jobs: build: - runs-on: macos-13 + runs-on: macos-15-intel steps: - uses: actions/checkout@v5 with: @@ -38,8 +38,8 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v2-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v2- + key: ${{ github.workflow }}-v3-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v3- - name: Clean previous DMG working-directory: ${{github.workspace}}