diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 470d8acf6ce8b5..1938af835fb90e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: vcpkg_overlay_ports: overlay/windows;overlay/ports vcpkg_packages_extras: angle libid3tag libmad qt5-winextras 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-min1012 @@ -25,7 +25,7 @@ jobs: vcpkg_packages_extras: qt5-macextras vcpkg_cache: /Users/runner/.cache/vcpkg/archives 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 @@ -81,7 +81,7 @@ jobs: VCPKG_OVERLAY_TRIPLETS: ${{ matrix.vcpkg_path }}/overlay/triplets VCPKG_OVERLAY_PORTS: ${{ matrix.vcpkg_overlay_ports }} 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.4 name: ${{ matrix.vcpkg_triplet }} runs-on: ${{ matrix.os }} @@ -124,7 +124,7 @@ jobs: if: runner.os == 'macOS' run: | brew update && brew install nasm - /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: Set up cache uses: actions/cache@v3 @@ -150,13 +150,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 }}/installed/${{ matrix.vcpkg_triplet }}/bin files-folder-filter: dll @@ -169,13 +169,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 }}/installed/${{ matrix.vcpkg_triplet }}/plugins files-folder-filter: dll diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake index cf3bff1295db64..03694c239d4ec2 100644 --- a/ports/libdjinterop/portfile.cmake +++ b/ports/libdjinterop/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xsco/libdjinterop REF "${VERSION}" - SHA512 c2784ffc6b0ddc9ad92a227621bb00cd1c88aa8f8abe82401774102f9be16dfbe9f0745523d517594faecba60b650a53613c7867afe57e6bcd8a2cc6288dd9ff + SHA512 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d HEAD_REF master ) diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index c96f88d9a2028f..82b8f0de473eaf 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdjinterop", - "version": "0.21.0", + "version": "0.22.1", "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index cde41304a50e2d..6199b9a9169416 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3897,7 +3897,7 @@ "port-version": 1 }, "libdjinterop": { - "baseline": "0.21.0", + "baseline": "0.22.1", "port-version": 0 }, "libdmx": { diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index 8d9fc7af549691..6069afdd218d0b 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fda458a81fa4a8520df2baf8dcf5211f60669707", + "version": "0.22.1", + "port-version": 0 + }, { "git-tree": "c643a7969afe7b095d0c6e779adbe14b09ad39d0", "version": "0.21.0",