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

…flict
daschuer · Nov 17, 2023 · 18eeb5b · 18eeb5b
1 parent 34b71d3
commit 18eeb5b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,26 +12,26 @@ jobs:
             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:
             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:
             check_disk_space: df -h

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/x64-linux.cmake b/overlay/triplets/x64-linux.cmake
diff --git a/overlay/triplets/x64-osx-min1015.cmake → ...ay/triplets/x64-osx-min1015-release.cmake b/overlay/triplets/x64-osx-min1015.cmake → ...ay/triplets/x64-osx-min1015-release.cmake
diff --git a/overlay/triplets/x64-windows.cmake b/overlay/triplets/x64-windows.cmake