From 432b38e4de69b6ce59f9df6292d9e2d6ca83b271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 24 Aug 2024 14:22:41 +0200 Subject: [PATCH 1/3] Add liblo to the feature list --- vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vcpkg.json b/vcpkg.json index 4f0b52a2e575c1..b07524ecc8e78b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -56,6 +56,7 @@ "name": "libmad", "platform": "!osx & !ios" }, + "liblo", "libmodplug", "libogg", "libopusenc", From c2947b5684406d3f5c2c923ade907c5b0830eeab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 24 Aug 2024 14:34:00 +0200 Subject: [PATCH 2/3] Update Azure codesigning action --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2ac690bba58f2..f726939bb1f670 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,13 +100,13 @@ jobs: env: AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} if: runner.os == 'Windows' && env.AZURE_TENANT_ID - uses: azure/azure-code-signing-action@v0.2.22 + uses: azure/trusted-signing-action@v0.4.0 with: azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} endpoint: https://weu.codesigning.azure.net/ - code-signing-account-name: mixxx + trusted-signing-account-name: mixxx certificate-profile-name: mixxx files-folder: ${{ matrix.vcpkg_path }}/vcpkg_installed/${{ matrix.vcpkg_triplet }}/bin files-folder-filter: dll @@ -119,13 +119,13 @@ jobs: env: AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} if: runner.os == 'Windows' && env.AZURE_TENANT_ID - uses: azure/azure-code-signing-action@v0.2.22 + uses: azure/trusted-signing-action@v0.4.0 with: azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} endpoint: https://weu.codesigning.azure.net/ - code-signing-account-name: mixxx + trusted-signing-account-name: mixxx certificate-profile-name: mixxx files-folder: ${{ matrix.vcpkg_path }}/vcpkg_installed/${{ matrix.vcpkg_triplet }}/Qt6/plugins files-folder-filter: dll @@ -139,13 +139,13 @@ jobs: env: AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} if: runner.os == 'Windows' && env.AZURE_TENANT_ID - uses: azure/azure-code-signing-action@v0.2.22 + uses: azure/trusted-signing-action@v0.4.0 with: azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} endpoint: https://weu.codesigning.azure.net/ - code-signing-account-name: mixxx + trusted-signing-account-name: mixxx certificate-profile-name: mixxx files-folder: ${{ matrix.vcpkg_path }}/vcpkg_installed/${{ matrix.vcpkg_triplet }}/Qt6/qml files-folder-filter: dll From e1076c9e0ac9d50af5d1e6752a6bfe8d705d6b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 24 Aug 2024 15:07:13 +0200 Subject: [PATCH 3/3] Update to Xcode 13.1 and move to GitHub workflow runner macos-12 --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f726939bb1f670..422bdf3417a9ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,13 +18,13 @@ jobs: vcpkg_triplet: x64-windows vcpkg_host_triplet: x64-windows check_disk_space: Get-PSDrive - - os: macos-11 + - os: macos-12 vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh vcpkg_triplet: x64-osx-min1100 vcpkg_host_triplet: x64-osx-min1100 check_disk_space: df -h - - os: macos-11 + - os: macos-12 vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh vcpkg_triplet: arm64-osx-min1100-release @@ -34,7 +34,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_12.4.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer MIXXX_VERSION: 2.5 name: ${{ matrix.vcpkg_triplet }} runs-on: ${{ matrix.os }} @@ -86,7 +86,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_13.1.app/Contents/Developer" xcrun --show-sdk-version - name: Check available disk space