Build - update vcpkg versions and CI dep versions

sonic-pi-net · Jan 14, 2025 · 809e761 · 809e761
1 parent 92e2c76
commit 809e761
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -97,7 +97,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         id: ruby-inst
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
         if: matrix.os == 'windows-latest'
 
       # Install gems Windows
@@ -128,22 +128,22 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           modules: "qtpositioning qtwebchannel qtwebengine qtwebsockets"
-          version: "6.7.0"
+          version: "6.8.1"
 
         # Install Elixir on Ubuntu
       - name: Linux Elixir
         uses: erlef/setup-beam@v1
         with:
           otp-version: "27"
-          elixir-version: "1.17"
+          elixir-version: "1.18"
         if: matrix.os == 'ubuntu-latest'
 
         # Install Elixir on Windows
       - name: Win Elixir
         uses: erlef/setup-beam@v1
         with:
           otp-version: "27"
-          elixir-version: "1.17"
+          elixir-version: "1.18"
         if: matrix.os == 'windows-latest'
 
         # Install Elixir on MacOS

diff --git a/app/linux-pre-vcpkg.sh b/app/linux-pre-vcpkg.sh
@@ -36,7 +36,8 @@ cd "${SCRIPT_DIR}"
 # Build vcpkg
 if [ ! -d "vcpkg" ]; then
     echo "Cloning vcpkg"
-    git clone --depth 1 --branch "${VCPKG_BRANCH:-2024.12.16}" https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 https://github.com/microsoft/vcpkg.git vcpkg
+    # git clone --depth 1 --branch "${VCPKG_BRANCH:-2024.12.16}" https://github.com/microsoft/vcpkg.git vcpkg
 fi
 
 export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"

diff --git a/app/mac-pre-vcpkg.sh b/app/mac-pre-vcpkg.sh
@@ -38,7 +38,7 @@ cd "${SCRIPT_DIR}"
 # Build vcpkg
 if [ ! -d "vcpkg" ]; then
     echo "Cloning vcpkg"
-    git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch 2024.12.16 https://github.com/microsoft/vcpkg.git vcpkg
 fi
 
 export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"

diff --git a/app/win-pre-vcpkg.bat b/app/win-pre-vcpkg.bat
@@ -5,7 +5,7 @@ cd %~dp0
 REM Build vcpkg
 if not exist "vcpkg\" (
     echo Cloning vcpkg
-    git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch 2024.12.16 https://github.com/microsoft/vcpkg.git vcpkg
 )
 
 set VCPKG_ROOT=%~dp0/vcpkg