Merge remote-tracking branch 'Mixxxdj/2.6' into Merge2.6into2.7

Author: JoergAtGithub

.github/deploy.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Deploy artifacts (e.g. dmg, deb files) built by CI to downloads.mixxx.org.
 
-set -eu -o pipefail
+set -Eeuo pipefail
 
 [ -z "${SSH_HOST}" ] && echo "Please set the SSH_HOST env var." >&2 && exit 1
 [ -z "${SSH_KEY}" ] && echo "Please set the SSH_KEY env var." >&2 && exit 1
@@ -15,15 +15,19 @@ set -eu -o pipefail
 SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 DEST_PATH="${DESTDIR}/${GIT_BRANCH}/${OS}"
-TMP_PATH="${DESTDIR}/.tmp/${UPLOAD_ID}"
+TMP_PATH="../../.tmp/${UPLOAD_ID}"
 
-echo "Deploying to $TMP_PATH, then to $DEST_PATH."
+echo "Deploying to ${TMP_PATH}, then to ${DEST_PATH}."
 
-# Start SSH agent
-ssh-agent -a ${SSH_AUTH_SOCK} > /dev/null
+eval "$(ssh-agent -s)" >/dev/null
+
+cleanup() {
+  eval "$(ssh-agent -k)" >/dev/null
+}
+trap cleanup EXIT
 
 # Add private key to SSH agent
-ssh-add - <<< "${SSH_KEY}"
+ssh-add - <<< "${SSH_KEY}" >/dev/null
 
 # realpath does not exist on macOS
 command -v realpath >/dev/null 2>&1 || realpath() {
@@ -50,13 +54,9 @@ do
     popd
 
     FILEEXT="${FILENAME##*.}"
+    
+    # Ensure directories exist
+    ${SSH} "${SSH_USER}@${SSH_HOST}" "mkdir -p '${DEST_PATH}' '${DEST_PATH}/${TMP_PATH}'"
 
-    rsync -e "${SSH}" --rsync-path="mkdir -p ${TMP_PATH} && rsync" -r --delete-after "${FILEPATH}" "${FILEPATH_HASH}" "${SSH_USER}@${SSH_HOST}:${TMP_PATH}"
-
-    # Move from the temporary path to the final destination.
-    ${SSH} "${SSH_USER}@${SSH_HOST}" << EOF
-    trap 'rm -rf "${TMP_PATH}"' EXIT
-    mkdir -p "${DEST_PATH}" &&
-    mv "${TMP_PATH}/${FILENAME}" "${TMP_PATH}/${FILENAME_HASH}" "${DEST_PATH}"
-EOF
+    rsync -e "${SSH}" --partial --partial-dir="${TMP_PATH}" --delay-updates -r "${FILEPATH}" "${FILEPATH_HASH}" "${SSH_USER}@${SSH_HOST}:${DEST_PATH}"
 done

.github/workflows/build.yml

@@ -96,7 +96,7 @@ jobs:
     - name: "[macOS] Install dependencies for nuget & vcpkg"
       if: runner.os == 'macOS'
       run: |
-          brew update && brew install automake nasm autoconf-archive nuget ${{ matrix.brew_extra }}
+          brew update-if-needed && brew install automake nasm autoconf-archive nuget ${{ matrix.brew_extra }}
           sudo xcode-select --switch "$DEVELOPER_DIR"
           xcrun --show-sdk-version
 
@@ -280,23 +280,15 @@ 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
         command: |
           cd ${{ matrix.vcpkg_path }}
           .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.deps_name }}-${{ steps.vars.outputs.sha_short }}.zip
-        on_retry_command: |
-          if [[ "$RUNNER_OS" == "Windows" ]]; then
-            powershell -Command "Get-Process ssh-agent -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue"
-          else
-            killall ssh-agent || true
-          fi
       env:
         DESTDIR: public_html/downloads/dependencies
         OS: ${{ runner.os }}
-        SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         SSH_HOST: downloads-hostgator.mixxx.org
         SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
         SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}