Skip to content

Commit

Permalink
Merge pull request #100 from daschuer/release_triplets
Browse files Browse the repository at this point in the history
Release triplets
  • Loading branch information
JoergAtGithub authored Nov 18, 2023
2 parents 0048787 + 18eeb5b commit 2fa319b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 21 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,30 @@ jobs:
include:
- os: windows-2019
vcpkg_path: C:\mixxx-vcpkg
vcpkg_buildtrees-root: C:\build
vcpkg_bootstrap: .\bootstrap-vcpkg.bat
vcpkg_triplet: x64-windows
vcpkg_host_triplet: x64-windows
vcpkg_triplet: x64-windows-release
vcpkg_host_triplet: x64-windows-release
vcpkg_overlay_ports: overlay/windows;overlay/ports
vcpkg_packages_extras: libid3tag libmad
check_disk_space: Get-PSDrive
- os: macos-11
vcpkg_path: /Users/runner/mixxx-vcpkg
vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees
vcpkg_bootstrap: ./bootstrap-vcpkg.sh
vcpkg_triplet: x64-osx-min1015
vcpkg_host_triplet: x64-osx-min1015
vcpkg_triplet: x64-osx-min1015-release
vcpkg_host_triplet: x64-osx-min1015-release
vcpkg_overlay_ports: overlay/osx:overlay/ports
vcpkg_packages_extras:
vcpkg_cache: /Users/runner/.cache/vcpkg/archives
check_disk_space: df -h
- os: macos-11
vcpkg_path: /Users/runner/mixxx-vcpkg
vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees
vcpkg_bootstrap: ./bootstrap-vcpkg.sh
vcpkg_triplet: arm64-osx-min1100
vcpkg_host_triplet: x64-osx-min1015
vcpkg_triplet: arm64-osx-min1100-release
vcpkg_host_triplet: x64-osx-min1015-release
vcpkg_overlay_ports: overlay/osx:overlay/ports
vcpkg_packages_extras:
vcpkg_cache: /Users/runner/.cache/vcpkg/archives
check_disk_space: df -h
env:
VCPKG_PACKAGES: >-
Expand Down Expand Up @@ -131,7 +132,7 @@ jobs:
working-directory: ${{ matrix.vcpkg_path }}

- name: Build packages
run: ./vcpkg install --vcpkg-root=${{ matrix.vcpkg_path }} --clean-after-build --recurse ${{ env.VCPKG_PACKAGES }}
run: ./vcpkg install --vcpkg-root=${{ matrix.vcpkg_path }} --x-buildtrees-root=${{ matrix.vcpkg_buildtrees-root }} --clean-after-build --recurse ${{ env.VCPKG_PACKAGES }}
working-directory: ${{ matrix.vcpkg_path }}

- name: Upload GitHub Actions artifacts of build logs
Expand Down
File renamed without changes.
7 changes: 0 additions & 7 deletions overlay/triplets/x64-linux.cmake

This file was deleted.

File renamed without changes.
5 changes: 0 additions & 5 deletions overlay/triplets/x64-windows.cmake

This file was deleted.

0 comments on commit 2fa319b

Please sign in to comment.