bump build versions

This commit is contained in:
Martin Rotter 2024-06-20 07:24:23 +02:00
parent c5cf8bda5c
commit 41d4eddb44
3 changed files with 9 additions and 9 deletions

View File

@ -33,20 +33,20 @@ jobs:
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
strategy: strategy:
matrix: matrix:
os: [windows-2019, ubuntu-20.04, macos-11] os: [windows-2022, ubuntu-20.04, macos-14-large]
no_lite: ["ON", "OFF"] no_lite: ["ON", "OFF"]
use_qt5: ["ON", "OFF"] use_qt5: ["ON", "OFF"]
include: include:
- os: windows-2019 - os: windows-2022
script_name: .\resources\scripts\github-actions\build-windows.ps1 script_name: .\resources\scripts\github-actions\build-windows.ps1
- os: ubuntu-20.04 - os: ubuntu-20.04
script_name: ./resources/scripts/github-actions/build-linux-mac.sh script_name: ./resources/scripts/github-actions/build-linux-mac.sh
- os: macos-11 - os: macos-14-large
script_name: ./resources/scripts/github-actions/build-linux-mac.sh script_name: ./resources/scripts/github-actions/build-linux-mac.sh
exclude: exclude:
- os: ubuntu-20.04 - os: ubuntu-20.04
use_qt5: "OFF" use_qt5: "OFF"
- os: macos-11 - os: macos-14-large
use_qt5: "ON" use_qt5: "ON"
steps: steps:
- name: Checkout source code - name: Checkout source code

View File

@ -59,7 +59,7 @@ else
USE_QT6="ON" USE_QT6="ON"
QTPATH="$(pwd)/Qt" QTPATH="$(pwd)/Qt"
QTVERSION="6.6.3" QTVERSION="6.7.2"
QTBIN="$QTPATH/$QTVERSION/$QTOS/bin" QTBIN="$QTPATH/$QTVERSION/$QTOS/bin"
# Install "aqtinstall" from its master branch to have latest code. # Install "aqtinstall" from its master branch to have latest code.

View File

@ -27,7 +27,7 @@ if ($use_qt5 -eq "ON") {
$use_qtmultimedia = "ON" $use_qtmultimedia = "ON"
} }
else { else {
$qt_version = "6.6.3" $qt_version = "6.7.2"
if ($use_webengine -eq "ON") { if ($use_webengine -eq "ON") {
$use_libmpv = "ON" $use_libmpv = "ON"
@ -45,7 +45,7 @@ $maria_version = "11.4.2"
$maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip"
$maria_output = "maria.zip" $maria_output = "maria.zip"
$cmake_version = "3.29.4" $cmake_version = "3.29.6"
$cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip" $cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip"
$cmake_output = "cmake.zip" $cmake_output = "cmake.zip"
@ -53,8 +53,8 @@ $zlib_version = "1.3.1"
$zlib_link = "https://github.com/madler/zlib/archive/refs/tags/v$zlib_version.zip" $zlib_link = "https://github.com/madler/zlib/archive/refs/tags/v$zlib_version.zip"
$zlib_output = "zlib.zip" $zlib_output = "zlib.zip"
$libmpv_date = "2024-06-04" $libmpv_date = "2024-06-19"
$libmpv_commit = "0c716e7" $libmpv_commit = "8df4cb5"
$libmpv_version = "{0}-git-{1}"-f $libmpv_date.Replace("-", ""), $libmpv_commit $libmpv_version = "{0}-git-{1}"-f $libmpv_date.Replace("-", ""), $libmpv_commit
$libmpv_link = "https://github.com/zhongfly/mpv-winbuild/releases/download/$libmpv_date-$libmpv_commit/mpv-dev-x86_64-$libmpv_version.7z" $libmpv_link = "https://github.com/zhongfly/mpv-winbuild/releases/download/$libmpv_date-$libmpv_commit/mpv-dev-x86_64-$libmpv_version.7z"
$libmpv_output = "mpv.zip" $libmpv_output = "mpv.zip"