Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libdjinterop] Update to 0.22.1 for 2.4 #147

Merged
merged 3 commits into from
Oct 3, 2024
Merged

[libdjinterop] Update to 0.22.1 for 2.4 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd28804
[libdjinterop] Update to 0.22.1 (#41251)
JoergAtGithub Sep 30, 2024
d1633e7
Update Azure codesigning action
daschuer Aug 24, 2024
dda920a
Update to Xcode 13.1 and move to GitHub workflow runner macos-12
daschuer Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ports/libdjinterop/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xsco/libdjinterop
REF "${VERSION}"
SHA512 c2784ffc6b0ddc9ad92a227621bb00cd1c88aa8f8abe82401774102f9be16dfbe9f0745523d517594faecba60b650a53613c7867afe57e6bcd8a2cc6288dd9ff
SHA512 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/libdjinterop/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3897,7 +3897,7 @@
"port-version": 1
},
"libdjinterop": {
"baseline": "0.21.0",
"baseline": "0.22.1",
"port-version": 0
},
"libdmx": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libdjinterop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fda458a81fa4a8520df2baf8dcf5211f60669707",
"version": "0.22.1",
"port-version": 0
},
{
"git-tree": "c643a7969afe7b095d0c6e779adbe14b09ad39d0",
"version": "0.21.0",
Expand Down
Loading