Append -release to release triplets like upstream to have no name co…

…nflict
daschuer · Nov 14, 2023 · 979a988 · 979a988
1 parent 869da91
commit 979a988
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,25 +11,25 @@ jobs:
           - os: windows-2019
             vcpkg_path: D:\mixxx-vcpkg
             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: angle libid3tag libmad qt5-winextras
             check_disk_space: Get-PSDrive
           - os: macos-11
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
-            vcpkg_triplet: x64-osx-min1012
-            vcpkg_host_triplet: x64-osx-min1012
+            vcpkg_triplet: x64-osx-min1012-release
+            vcpkg_host_triplet: x64-osx-min1012-release
             vcpkg_overlay_ports: overlay/osx:overlay/ports
             vcpkg_packages_extras: qt5-macextras
             vcpkg_cache: /Users/runner/.cache/vcpkg/archives
             check_disk_space: df -h
           - os: macos-11
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
-            vcpkg_triplet: arm64-osx-min1100
-            vcpkg_host_triplet: x64-osx-min1012
+            vcpkg_triplet: arm64-osx-min1100-release
+            vcpkg_host_triplet: x64-osx-min1012-release
             vcpkg_overlay_ports: overlay/osx:overlay/ports
             vcpkg_packages_extras: qt5-macextras
             vcpkg_cache: /Users/runner/.cache/vcpkg/archives

diff --git a/overlay/triplets/arm64-osx-min1100.cmake → .../triplets/arm64-osx-min1100-release.cmake b/overlay/triplets/arm64-osx-min1100.cmake → .../triplets/arm64-osx-min1100-release.cmake
diff --git a/overlay/triplets/arm64-osx.cmake b/overlay/triplets/arm64-osx.cmake
diff --git a/overlay/triplets/x64-osx-min1012.cmake → ...ay/triplets/x64-osx-min1012-release.cmake b/overlay/triplets/x64-osx-min1012.cmake → ...ay/triplets/x64-osx-min1012-release.cmake
diff --git a/overlay/triplets/x64-windows.cmake b/overlay/triplets/x64-windows.cmake