Skip to content

Commit

Permalink
Merge remote-tracking branch 'mixxxdj/2.4' into 2.4-rel
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Nov 17, 2023
2 parents 3cb806a + 8cd543b commit 14128e6
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
check_disk_space: df -h
env:
VCPKG_PACKAGES: >-
ableton
ableton-link
benchmark
chromaprint
fdk-aac
Expand Down Expand Up @@ -103,14 +103,21 @@ jobs:
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
working-directory: ${{ matrix.vcpkg_path }}

# python3-distutils is required for fontconfig but it has been removed in Python 3.12
- name: Setup Python 3.11
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Bootstrap vcpkg
run: ${{ matrix.vcpkg_bootstrap }}
working-directory: ${{ matrix.vcpkg_path }}

# FFmpeg requires nasm
- name: "[macOS] Bootstrap vcpkg"
if: runner.os == 'macOS'
run: |
brew update && brew install nasm automake pkg-config
brew update && brew install nasm
/bin/bash -c "sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer"
xcrun --show-sdk-version
- name: Set up cache
Expand Down

0 comments on commit 14128e6

Please sign in to comment.