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

Release triplets #100

Merged
merged 2 commits into from
Nov 18, 2023
Merged

Release triplets #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34b71d3
Use -x-buildtrees-root=C:\build on windows
daschuer Nov 15, 2023
18eeb5b
Append -release to release triplets like upstream to have no name con…
daschuer Nov 14, 2023
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
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
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 }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this only needed for 2.5? Should it be backported to 2.4?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because Qt6 uses onger paths.

working-directory: ${{ matrix.vcpkg_path }}

- name: Upload GitHub Actions artifacts of build logs
Expand Down
0 overlay/triplets/arm64-osx-min1100.cmake → .../triplets/arm64-osx-min1100-release.cmake
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions overlay/triplets/x64-linux.cmake
View file
Open in desktop

This file was deleted.

0 overlay/triplets/x64-osx-min1015.cmake → ...ay/triplets/x64-osx-min1015-release.cmake
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions overlay/triplets/x64-windows.cmake
View file
Open in desktop

This file was deleted.

Loading