From 809e761b879906e85eb36688b879654663b5fe44 Mon Sep 17 00:00:00 2001 From: Sam Aaron Date: Tue, 14 Jan 2025 15:38:45 +0000 Subject: [PATCH] Build - update vcpkg versions and CI dep versions --- .github/workflows/build.yml | 8 ++++---- app/linux-pre-vcpkg.sh | 3 ++- app/mac-pre-vcpkg.sh | 2 +- app/win-pre-vcpkg.bat | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 277503d399..9ea72a7ec4 100644 --- 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,14 +128,14 @@ 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 @@ -143,7 +143,7 @@ jobs: 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 index 762584f472..064e845c08 100755 --- 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 index ceb68e5710..85d6ad1562 100755 --- 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 index 692881be7f..5bd72aac0d 100755 --- 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