diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1670c25a6..7823fce4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -185,7 +185,7 @@ jobs: - suffix: "" custom_glfw: false - name: 🍎 macOS 12.0${{ matrix.suffix }} + name: 🍎 macOS 13${{ matrix.suffix }} steps: - name: 🧰 Checkout @@ -315,7 +315,7 @@ jobs: macos-arm64-build: runs-on: ubuntu-22.04 - name: 🍎 macOS 12.1 arm64 + name: 🍎 macOS 13 arm64 outputs: IMHEX_VERSION: ${{ steps.build.outputs.IMHEX_VERSION }} steps: @@ -359,7 +359,7 @@ jobs: macos-arm64-package: runs-on: macos-13 - name: 🍎 macOS 12.1 arm64 Packaging + name: 🍎 macOS 13 arm64 Packaging needs: macos-arm64-build env: IMHEX_VERSION: ${{ needs.macos-arm64-build.outputs.IMHEX_VERSION }} diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile index 1812c5e8a..df6677a3a 100644 --- a/dist/macOS/arm64.Dockerfile +++ b/dist/macOS/arm64.Dockerfile @@ -1,7 +1,7 @@ # This base image is also known as "crosscompile". See arm64.crosscompile.Dockerfile FROM ghcr.io/itrooz/macos-crosscompile:clang17-nosdk as build -ENV MACOSX_DEPLOYMENT_TARGET 12.1 +ENV MACOSX_DEPLOYMENT_TARGET 13.0 # -- DOWNLOADING STUFF @@ -126,7 +126,7 @@ if [ "$CUSTOM_GLFW" ]; then -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache \ -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_INSTALL_PREFIX=/vcpkg/installed/arm-osx-mytriplet \ - -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=12.1 \ + -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 \ .. ninja -j $JOBS install @@ -148,7 +148,7 @@ RUN --mount=type=cache,target=/cache --mount=type=cache,target=/mnt/ImHex/build/ `# ccache flags` \ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \ `# MacOS cross-compiling flags` \ - -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=12.1 \ + -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 \ `# Override compilers for code generators` \ -DNATIVE_CMAKE_C_COMPILER=/usr/bin/clang -DNATIVE_CMAKE_CXX_COMPILER=/usr/bin/clang++ \ `# Normal ImHex flags` \