chore: update buildenv script to download from GH

acolombier · acolombier · commit 7e9a7815d9b3 · 2025-03-15T08:58:22.000Z
diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh
@@ -15,28 +15,82 @@ realpath() {
     cd "${OLDPWD}" || exit 1
 }
 
+buildenv_from_download_server() { # 2.6
+    http_code=$(curl -sI -w "%{http_code}" "https://downloads.mixxx.org/dependencies/${1}/macOS/${2}.zip" -o /dev/null)
+    if [ "$http_code" -ne 200 ]; then
+        >&2 echo "Downloading  failed with HTTP status code: $http_code"
+        exit 1
+    fi
+    curl "https://downloads.mixxx.org/dependencies/${1}/macOS/${2}.zip" -o "${3}.zip"
+    OBSERVED_SHA256=$(shasum -a 256 "${3}.zip"|cut -f 1 -d' ')
+    if [[ "$OBSERVED_SHA256" == "$4" ]]; then
+        >&2 echo "Download matched expected SHA256 sum $4"
+        echo "${3}.zip"
+    else
+        >&2 echo "ERROR: Download did not match expected SHA256 checksum!"
+        >&2 echo "Expected $4"
+        >&2 echo "Got $OBSERVED_SHA256"
+        exit 1
+    fi
+}
+
+buildenv_from_gh_release() {
+    part=0
+    trap 'find . -name "mixxx-deps-${1}-${3}-${2}.*" -delete && exit' SIGINT SIGABRT
+    part_uri="https://github.com/acolombier/vcpkg/releases/download/${1}-${2}/mixxx-deps-${1}-${3}-${2}.zip.part0${part}"
+    while true; do
+        http_code=$(curl -sI -w "%{http_code}" "$part_uri" -o /dev/null)
+        if [ "$http_code" -ne 200 ] && [ "$http_code" -ne 302 ]; then
+            if [ "$part" = 0 ]; then
+                >&2 echo "Downloading $part_uri failed with HTTP status code: $http_code"
+                exit 1
+            else
+                break
+            fi
+        fi
+        curl -L "${part_uri}" -o "$(basename "${part_uri}")"
+        part=$(( part + 1))
+        part_uri="https://github.com/acolombier/vcpkg/releases/download/${1}-${2}/mixxx-deps-${1}-${3}-${2}.zip.part0${part}"
+    done
+
+    cat mixxx-deps-"${1}-${3}-${2}".zip.part* > "${4}"
+    find . -name "mixxx-deps-${1}-${3}-${2}.zip.part*" -delete
+
+    expected_sha256=$(curl -L "https://github.com/acolombier/vcpkg/releases/download/${1}-${2}/mixxx-deps-${1}-${3}-${2}.zip.sha256")
+    observed_sha256=$(shasum -a 256 "${4}"|cut -f 1 -d' ')
+
+    if [ "$expected_sha256" = "$observed_sha256" ]; then
+        >&2 echo "Download matched expected SHA256 sum"
+        rm -f "mixxx-deps-${1}-${3}-${2}.sha256"
+    else
+        >&2 echo "ERROR: Download did not match expected SHA256 checksum!"
+        find . -name "mixxx-deps-${1}-${3}-${2}.*" -delete
+        exit 1
+    fi
+}
+
 # some hackery is required to be compatible with both bash and zsh
 THIS_SCRIPT_NAME=${BASH_SOURCE[0]}
 [ -z "$THIS_SCRIPT_NAME" ] && THIS_SCRIPT_NAME=$0
 
+VCPKG_COMMIT_SHA="d3b6db3"
+BUILDENV_MINOR_VERSION="2.6"
+
 if [ -n "${BUILDENV_ARM64}" ]; then
     VCPKG_TARGET_TRIPLET="arm64-osx-min1100-release"
-    BUILDENV_BRANCH="2.5-rel"
-    BUILDENV_NAME="mixxx-deps-2.5-arm64-osx-min1100-release-40c29ff"
+    BUILDENV_BRANCH_SUFFIX="-rel"
     BUILDENV_SHA256="b76685e77f681baf8fdc5037297b0f16d323a405d09ce276d8844304530278e1"
 else
     if [ -n "${BUILDENV_RELEASE}" ]; then
         VCPKG_TARGET_TRIPLET="x64-osx-min1100-release"
-        BUILDENV_BRANCH="2.5-rel"
-        BUILDENV_NAME="mixxx-deps-2.5-x64-osx-min1100-release-40c29ff"
+        BUILDENV_BRANCH_SUFFIX="-rel"
         BUILDENV_SHA256="a9b7dd2cb9ab00db6d05ac1f05aab933ed0ab2697f71db1a1bad70305befcf1b"
     else
         VCPKG_TARGET_TRIPLET="x64-osx-min1100"
-        BUILDENV_BRANCH="2.5"
-        BUILDENV_NAME="mixxx-deps-2.5-x64-osx-min1100-c15790e"
         BUILDENV_SHA256="0252293436efed1b043d5c6ee384a9502ca0ade712eff95b2c0d2199d94598bb"
     fi
 fi
+BUILDENV_NAME="mixxx-deps-${BUILDENV_MINOR_VERSION}-${VCPKG_TARGET_TRIPLET}-${VCPKG_COMMIT_SHA}"
 
 MIXXX_ROOT="$(realpath "$(dirname "$THIS_SCRIPT_NAME")/..")"
 
@@ -56,22 +110,14 @@ case "$1" in
         mkdir -p "${BUILDENV_BASEPATH}"
         if [ ! -d "${BUILDENV_PATH}" ]; then
             if [ "$1" != "--profile" ]; then
-                echo "Build environment $BUILDENV_NAME not found in mixxx repository, downloading https://downloads.mixxx.org/dependencies/${BUILDENV_BRANCH}/macOS/${BUILDENV_NAME}.zip"
-                http_code=$(curl -sI -w "%{http_code}" "https://downloads.mixxx.org/dependencies/${BUILDENV_BRANCH}/macOS/${BUILDENV_NAME}.zip" -o /dev/null)
-                if [ "$http_code" -ne 200 ]; then
-                    echo "Downloading  failed with HTTP status code: $http_code"
-                    exit 1
-                fi
-                curl "https://downloads.mixxx.org/dependencies/${BUILDENV_BRANCH}/macOS/${BUILDENV_NAME}.zip" -o "${BUILDENV_PATH}.zip"
-                OBSERVED_SHA256=$(shasum -a 256 "${BUILDENV_PATH}.zip"|cut -f 1 -d' ')
-                if [[ "$OBSERVED_SHA256" == "$BUILDENV_SHA256" ]]; then
-                    echo "Download matched expected SHA256 sum $BUILDENV_SHA256"
+                if [ "$BUILDENV_SRC" = "gh" ]; then
+                    echo "Build environment $BUILDENV_NAME not found in mixxx repository, downloading from Mixxx's VCPKG repo"
+                    buildenv_from_gh_release "${BUILDENV_MINOR_VERSION}" "${VCPKG_COMMIT_SHA}" "${VCPKG_TARGET_TRIPLET}" "${BUILDENV_PATH}.zip"
                 else
-                    echo "ERROR: Download did not match expected SHA256 checksum!"
-                    echo "Expected $BUILDENV_SHA256"
-                    echo "Got $OBSERVED_SHA256"
-                    exit 1
+                    echo "Build environment $BUILDENV_NAME not found in mixxx repository, downloading from Mixxx download server"
+                    buildenv_from_download_server "${BUILDENV_BRANCH}${BUILDENV_BRANCH_SUFFIX}" "${BUILDENV_NAME}" "${BUILDENV_PATH}" "${BUILDENV_SHA256}"
                 fi
+
                 echo ""
                 echo "Extracting ${BUILDENV_NAME}.zip..."
                 unzip "${BUILDENV_PATH}.zip" -d "${BUILDENV_BASEPATH}" && \
diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat
@@ -20,18 +20,21 @@ IF NOT DEFINED INSTALL_ROOT (
     SET INSTALL_ROOT=%MIXXX_ROOT%\install
 )
 
-IF DEFINED BUILDENV_RELEASE (
-    SET BUILDENV_BRANCH=2.5-rel
-    SET VCPKG_TARGET_TRIPLET=x64-windows-release
-    vcpkg_update_main
-    SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-release-40c29ff
-    SET BUILDENV_SHA256=a9d809ae9c52d8a553af1bb8a58565649ced7b1f938d1d37c1c7d83ad53aacf3
-) ELSE (
-    SET BUILDENV_BRANCH=2.5
+VCPKG_COMMIT_SHA="d3b6db3"
+BUILDENV_MINOR_VERSION="2.6"
+
+@REM IF DEFINED BUILDENV_RELEASE (
+@REM     SET BUILDENV_BRANCH=2.5-rel
+@REM     SET VCPKG_TARGET_TRIPLET=x64-windows-release
+@REM     vcpkg_update_main
+@REM     SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-release-40c29ff
+@REM     SET BUILDENV_SHA256=a9d809ae9c52d8a553af1bb8a58565649ced7b1f938d1d37c1c7d83ad53aacf3
+@REM ) ELSE (
     SET VCPKG_TARGET_TRIPLET=x64-windows
-    SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-c15790e
     SET BUILDENV_SHA256=138e4685ec73c6a6a509f71f8573be581403b091e4ecea2314df2cc79f9720b9
-)
+@REM )
+SET BUILDENV_NAME=mixxx-deps-!BUILDENV_MINOR_VERSION!-!VCPKG_TARGET_TRIPLET!-!VCPKG_COMMIT_SHA!
+
 
 IF "%~1"=="" (
     REM In case of manual start by double click no arguments are specified: Default to COMMAND_setup
@@ -61,11 +64,51 @@ EXIT /B 0
     )
 
     IF NOT EXIST "%BUILDENV_PATH%" (
-        SET BUILDENV_URL=https://downloads.mixxx.org/dependencies/!BUILDENV_BRANCH!/Windows/!BUILDENV_NAME!.zip
+        SET BUILDENV_URL=https://github.com/acolombier/vcpkg/releases/download/!BUILDENV_MINOR_VERSION!-!VCPKG_COMMIT_SHA!/!BUILDENV_NAME!.zip
         IF NOT EXIST "!BUILDENV_PATH!.zip" (
-            ECHO ^Download prebuilt build environment from "!BUILDENV_URL!" to "!BUILDENV_PATH!.zip"...
-            REM TODO: The /DYNAMIC parameter is required because our server does not yet support HTTP range headers
-            BITSADMIN /transfer buildenvjob /download /priority normal /DYNAMIC !BUILDENV_URL! "!BUILDENV_PATH!.zip"
+            ECHO ^Download prebuilt build environment from "!BUILDENV_URL!"...
+            REM Create a temporary directory to store the parts
+            IF NOT EXIST "%TEMP%\~buildenv" MD "%TEMP%\~buildenv"
+
+            SET "PART_NUMBER=0"
+
+            :DOWNLOAD_LOOP
+            ECHO ^Attempting to download part !PART_NUMBER!...
+
+            REM Construct the URL for this part
+            SET "PART_URL=!BUILDENV_URL!.part!PART_NUMBER!"
+            SET "PART_FILE=!BUILDENV_PATH!.zip.part!PART_NUMBER!"
+
+            REM Download the part using BitsAdmin
+            BITSADMIN /transfer buildenvjob_part!PART_NUMBER! /download /priority normal /DYNAMIC !PART_URL! "!PART_FILE!"
+            IF %ERRORLEVEL% NEQ 0 (
+                IF %ERRORLEVEL% NEQ 0 (
+                    ECHO ^Part !PART_NUMBER! not found. Stopping download loop.
+                    GOTO :CONCATENATE
+                ) ELSE (
+                    ECHO ^Error downloading part !PART_NUMBER!
+                    PAUSE
+                    EXIT /B 1
+                )
+            )
+
+            SET /A PART_NUMBER +=1
+            GOTO :DOWNLOAD_LOOP
+
+            :CONCATENATE
+            ECHO ^Concatenating all parts into "!BUILDENV_PATH!.zip"...
+
+            REM Concatenate the files in binary mode
+            COPY /b "!BUILDENV_PATH!.zip.part*" "!BUILDENV_PATH!.zip" >nul 2>&1
+            IF %ERRORLEVEL% NEQ 0 (
+                ECHO ^Error concatenating parts!
+                PAUSE
+                EXIT /B 1
+            )
+
+            REM Clean up temporary files and directory
+            RD /S /Q "%TEMP%\~buildenv"
+
             ECHO ^Download complete.
             certutil -hashfile "!BUILDENV_PATH!.zip" SHA256 | FIND /C "!BUILDENV_SHA256!"
             IF errorlevel 1 (
