Merge remote-tracking branch 'mixxxdj/2.7' into 2.7-rel-update

Adjusted .github/workflows/build.yml for release build

Author: JoergAtGithub

.github/deploy.sh

@@ -19,6 +19,8 @@ TMP_PATH="../../.tmp/${UPLOAD_ID}"
 
 echo "Deploying to ${TMP_PATH}, then to ${DEST_PATH}."
 
+mkdir -p $HOME/.ssh
+
 eval "$(ssh-agent -s)" >/dev/null
 
 cleanup() {

.github/pull_request_template.md

@@ -6,26 +6,28 @@
 
 - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
 - [ ] SHA512s are updated for each updated download.
-- [ ] The "supports" clause reflects platforms that may be fixed by this new version.
-- [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.
-- [ ] Any patches that are no longer applied are deleted from the port's directory.
+- [ ] The "supports" clause reflects platforms that may be fixed by this new version, or no changes were necessary.
+- [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) and [CI feature baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.feature.baseline.txt) entries are removed from that file, or no entries needed to be changed.
+- [ ] All patch files in the port are applied and succeed.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
-- [ ] Only one version is added to each modified port's versions file.
+- [ ] Exactly one version is added in each modified versions file.
 
 END OF PORT UPDATE CHECKLIST (delete this line) -->
 
 <!-- If this PR adds a new port, please uncomment and fill out this checklist:
 
 - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
-- [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
-- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
+- [ ] The packaged project shows strong association with the chosen port name. Check this box if at least one of the following criteria is met:
+    - [ ] The project is in Repology: https://repology.org/<PORT NAME>/versions
+    - [ ] The project is amongst the first web search results for "<PORT NAME>" or "<PORT NAME> C++". Include a screenshot of the search engine results in the PR.
+    - [ ] The port name follows the 'GitHubOrg-GitHubRepo' form or equivalent `Owner-Project` form.
+- [ ] Optional dependencies of the build are all controlled by the port. A dependency is controlled if it is declared an unconditional dependency in `vcpkg.json`, or explicitly disabled through patches or build system arguments such as [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) or [VCPKG_LOCK_FIND_PACKAGE](https://learn.microsoft.com/vcpkg/users/buildsystems/cmake-integration#vcpkg_lock_find_package_pkg)
 - [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
 - [ ] The license declaration in `vcpkg.json` matches what upstream says.
 - [ ] The installed as the "copyright" file matches what upstream says.
 - [ ] The source code of the component installed comes from an authoritative source.
-- [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context.
+- [ ] The generated "usage text" is brief and accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. Don't add a usage file if the automatically generated usage is correct.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
-- [ ] Only one version is in the new port's versions file.
-- [ ] Only one version is added to each modified port's versions file.
+- [ ] Exactly one version is added in each modified versions file.
 
 END OF NEW PORT CHECKLIST (delete this line) -->

.github/workflows/build.yml

@@ -59,6 +59,13 @@ jobs:
             developer_dir: /Applications/Xcode_16.4.app/Contents/Developer
             brew_extra: libtool
             check_disk_space: df -h
+          - os: ubuntu-24.04
+            deps_name: x64-linux-rel
+            vcpkg_path: /home/runner/mixxx-vcpkg
+            vcpkg_bootstrap: ./bootstrap-vcpkg.sh
+            vcpkg_triplet: x64-linux-release
+            vcpkg_host_triplet: x64-linux-release
+            check_disk_space: df -h
           - os: ubuntu-24.04
             deps_name: arm64-android-rel
             vcpkg_path: /home/runner/mixxx-vcpkg
@@ -82,11 +89,49 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: mixxx-vcpkg
+
+      # The ephemeral space doesn't seem consistent between runs. Sometimes it is available directly on the root (/), sometime on the mount folder (/mnt)
+      # If the ephemeral storage is available under a seperate drive, we bind-mount as thee `vcpkg_path`
+    - name: Move checkout and use the ephemeral storage if available
+      if: runner.os == 'Linux'
+      run: |
+        set -x
+        if [ -d /mnt ]; then
+          mntSpace=$(df --output=avail /mnt | tail -n 1)
+          rootSpace=$(df --output=avail / | tail -n 1)
+          if [ $mntSpace -gt $rootSpace ]; then
+            mkdir ${{ matrix.vcpkg_path }}
+            sudo mount -o bind /mnt ${{ matrix.vcpkg_path }}
+            sudo chown -R `id -u`:`id -g` ${{ matrix.vcpkg_path }}
+            rsync -a ${{ github.workspace }}/mixxx-vcpkg/ ${{ matrix.vcpkg_path }}
+            exit 0
+          fi
+        fi
+        # In case we cannot use the ephemeral disk space because it either doesn't 
+        # exist or is too small, we free as much as possible on the root.
+        sudo rm -rf /home/packer                 # Free up 677M
+        sudo rm -rf /opt/az                      # Free up 649M
+        sudo rm -rf /opt/google                  # Free up 378M
+        sudo rm -rf /opt/hostedtoolcache/CodeQL  # Free up 1.6G
+        sudo rm -rf /opt/hostedtoolcache/go      # Free up 808M
+        sudo rm -rf /opt/hostedtoolcache/node    # Free up 532M
+        sudo rm -rf /opt/hostedtoolcache/PyPy    # Free up 520M
+        sudo rm -rf /opt/hostedtoolcache/Python  # Free up 1.5G
+        sudo rm -rf /opt/microsoft               # Free up 781M
+        sudo rm -rf /opt/pipx                    # Free up 499M
+        sudo rm -rf /usr/lib/google-cloud-sdk    # Free up 957M
+        sudo rm -rf /usr/local/julia1.11.7       # Free up 996M
+        sudo rm -rf /usr/local/share/powershell  # Free up 1.3G
+        sudo rm -rf /usr/share/dotnet            # Free up 3.4G
+        sudo rm -rf /usr/share/swift             # Free up 3.2G
+        sudo rm -rf /usr/local/share/vcpkg       # Size unknown, but obvious duplicate
+        rsync -a ${{ github.workspace }}/mixxx-vcpkg/ ${{ matrix.vcpkg_path }}
       
       # Workaround for issues https://github.com/microsoft/vcpkg/issues/8272  
       # and https://github.com/actions/checkout/issues/197 
       # to keep the build path short and work around size limits on the windows runner D: drive 
     - name: Move checkout
+      if: runner.os != 'Linux'
       run: cmake -E copy_directory ${{ github.workspace }}/mixxx-vcpkg ${{ matrix.vcpkg_path }}
 
     - name: "Work around actions/runner-images#9966"
@@ -121,14 +166,19 @@ jobs:
             mono-complete \
             libasound2-dev \
             libegl1-mesa-dev \
+            libgl1-mesa-dev \
+            libdrm-dev \
+            libgbm-dev \
             libghc-resolv-dev \
             libglu1-mesa-dev \
             libltdl-dev \
+            libsm-dev \
             libudev-dev \
             libx11-xcb-dev \
             libxi-dev \
             libxkbcommon-dev \
             libxkbcommon-x11-dev \
+            libxrandr-dev \
             libxrender-dev \
             linux-libc-dev \
             nasm \
@@ -179,28 +229,9 @@ jobs:
           echo "ANDROID_NDK_HOME=/usr/lib/android-sdk/ndk/${{ matrix.android_ndk }}" >> "${GITHUB_ENV}"   
           sudo sdkmanager --list_installed
 
-    # Remove unused pre-installed software as the runner runs out of space otherwise
-    # Currently freeing up about 17.7G, ~20%
-    - name: "[android] Free up disk space"
-      if: startsWith(matrix.deps_name, 'arm64-android')
-      run: |
-          sudo apt-get autoremove -y && sudo apt-get clean
-          sudo rm -rf /home/packer                 # Free up 677M
-          sudo rm -rf /opt/az                      # Free up 649M
-          sudo rm -rf /opt/google                  # Free up 378M
-          sudo rm -rf /opt/hostedtoolcache/CodeQL  # Free up 1.6G
-          sudo rm -rf /opt/hostedtoolcache/go      # Free up 808M
-          sudo rm -rf /opt/hostedtoolcache/node    # Free up 532M
-          sudo rm -rf /opt/hostedtoolcache/PyPy    # Free up 520M
-          sudo rm -rf /opt/hostedtoolcache/Python  # Free up 1.5G
-          sudo rm -rf /opt/microsoft               # Free up 781M
-          sudo rm -rf /opt/pipx                    # Free up 499M
-          sudo rm -rf /usr/lib/google-cloud-sdk    # Free up 957M
-          sudo rm -rf /usr/local/julia1.11.7       # Free up 996M
-          sudo rm -rf /usr/local/share/powershell  # Free up 1.3G
-          sudo rm -rf /usr/share/dotnet            # Free up 3.4G
-          sudo rm -rf /usr/share/swift             # Free up 3.2G
-          sudo rm -rf /usr/local/share/vcpkg       # Size unknown, but obvious duplicate
+    - name: "[ubuntu/android] Free up APT cachd"
+      if: runner.os == 'Linux'
+      run: sudo apt-get autoremove -y && sudo apt-get clean
 
     - name: Check available disk space
       run: ${{ matrix.check_disk_space }}
@@ -303,6 +334,7 @@ jobs:
       # Use retry loop to work around intermittent transfer issue
       uses: nick-fields/retry@9417ab499314dfe692edb043ded2ff9b3f5f0a68 # v3
       with:
+        shell: bash
         max_attempts: 10
         timeout_minutes: 20
         retry_wait_seconds: 5