From 4ef7c2a39d653017beaefb7a229cee00e696ba1d Mon Sep 17 00:00:00 2001 From: fwcd Date: Tue, 6 Feb 2024 20:18:42 +0100 Subject: [PATCH 1/5] Add arm64-ios-release CI --- .github/workflows/build.yml | 7 +++++++ overlay/triplets/arm64-ios-release.cmake | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 overlay/triplets/arm64-ios-release.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ca6b67c7a14d..9190ec1f76bd72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,13 @@ jobs: vcpkg_triplet: arm64-osx-min1100-release vcpkg_host_triplet: x64-osx-min1015-release check_disk_space: df -h + - os: macos-11 + vcpkg_path: /Users/runner/mixxx-vcpkg + vcpkg_bootstrap: ./bootstrap-vcpkg.sh + vcpkg_triplet: arm64-ios-release + vcpkg_host_triplet: x64-osx-min1015-release + vcpkg_overlay_ports: overlay/osx:overlay/ports + check_disk_space: df -h env: VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }} diff --git a/overlay/triplets/arm64-ios-release.cmake b/overlay/triplets/arm64-ios-release.cmake new file mode 100644 index 00000000000000..39eca20babc9a2 --- /dev/null +++ b/overlay/triplets/arm64-ios-release.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME iOS) + +set(VCPKG_BUILD_TYPE release) From 89896a019b90a4e437d55c47361138c699c2b499 Mon Sep 17 00:00:00 2001 From: fwcd Date: Thu, 29 Feb 2024 03:47:20 +0100 Subject: [PATCH 2/5] Build for iOS with Xcode 15.2 on macOS 14 --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9190ec1f76bd72..ae4f9453f3fbfd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,29 +19,31 @@ jobs: vcpkg_host_triplet: x64-windows check_disk_space: Get-PSDrive - os: macos-11 + xcode: '12.4' vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh vcpkg_triplet: x64-osx-min1015 vcpkg_host_triplet: x64-osx-min1015 check_disk_space: df -h - os: macos-11 + xcode: '12.4' vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh vcpkg_triplet: arm64-osx-min1100-release vcpkg_host_triplet: x64-osx-min1015-release check_disk_space: df -h - - os: macos-11 + - os: macos-14 + xcode: '15.2' vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh vcpkg_triplet: arm64-ios-release - vcpkg_host_triplet: x64-osx-min1015-release + vcpkg_host_triplet: arm64-osx-min1100-release vcpkg_overlay_ports: overlay/osx:overlay/ports check_disk_space: df -h env: VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }} DEPS_BASE_NAME: mixxx-deps - DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer MIXXX_VERSION: 2.5 name: ${{ matrix.vcpkg_triplet }} runs-on: ${{ matrix.os }} @@ -87,7 +89,7 @@ jobs: if: runner.os == 'macOS' run: | brew update && brew install nasm autoconf-archive - /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer" + /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" xcrun --show-sdk-version - name: Check available disk space From e1178d688c74fbbe8c255529e2e305624089e467 Mon Sep 17 00:00:00 2001 From: fwcd Date: Thu, 29 Feb 2024 03:49:47 +0100 Subject: [PATCH 3/5] Set `DEVELOPER_DIR` again --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae4f9453f3fbfd..bb4066eb690179 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,7 @@ jobs: VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }} DEPS_BASE_NAME: mixxx-deps + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer MIXXX_VERSION: 2.5 name: ${{ matrix.vcpkg_triplet }} runs-on: ${{ matrix.os }} From 9fe4fd409a5a385194ae5f291f0e9a60acf1c8fe Mon Sep 17 00:00:00 2001 From: fwcd Date: Thu, 21 Mar 2024 03:16:20 +0100 Subject: [PATCH 4/5] Install missing automake in CI This seems to be required to build icu --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb4066eb690179..c880286617f21e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: - name: "[macOS] Bootstrap vcpkg" if: runner.os == 'macOS' run: | - brew update && brew install nasm autoconf-archive + brew update && brew install nasm autoconf-archive automake /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" xcrun --show-sdk-version From ee9cd77451fb81b14fd8112f61214037681508f3 Mon Sep 17 00:00:00 2001 From: fwcd Date: Thu, 21 Mar 2024 04:00:46 +0100 Subject: [PATCH 5/5] Install missing libtool dependency --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c880286617f21e..04f470d208891b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: - name: "[macOS] Bootstrap vcpkg" if: runner.os == 'macOS' run: | - brew update && brew install nasm autoconf-archive automake + brew update && brew install nasm autoconf-archive automake libtool /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" xcrun --show-sdk-version