diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index efd4eaacf455..7e889f788c0f 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -35,7 +35,6 @@ jobs: uses: actions/cache@v5 with: path: | # openssl and llvm take much longer to build so they are cached separately - libs/pcre.lib libs/pcre2-8.lib libs/iconv.lib libs/gc.lib @@ -55,16 +54,13 @@ jobs: add-to-path: false - name: Build libgc if: steps.cache-libs.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.8 -AtomicOpsVersion 7.8.2 - - name: Build libpcre - if: steps.cache-libs.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-pcre.ps1 -BuildTree deps\pcre -Version 8.45 + run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.12 -AtomicOpsVersion 7.10.0 - name: Build libpcre2 if: steps.cache-libs.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.45 + run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.47 - name: Build libiconv if: steps.cache-libs.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.18 + run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.19 - name: Build libffi if: steps.cache-libs.outputs.cache-hit != 'true' run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.5.1 @@ -79,7 +75,7 @@ jobs: run: .\etc\win-ci\build-yaml.ps1 -BuildTree deps\yaml -Version 0.2.5 - name: Build libxml2 if: steps.cache-libs.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.13.8 + run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.15.3 - name: Cache OpenSSL id: cache-openssl @@ -117,7 +113,6 @@ jobs: uses: actions/cache@v5 with: path: | # openssl and llvm take much longer to build so they are cached separately - libs/pcre-dynamic.lib libs/pcre2-8-dynamic.lib libs/iconv-dynamic.lib libs/gc-dynamic.lib @@ -126,7 +121,6 @@ jobs: libs/mpir-dynamic.lib libs/yaml-dynamic.lib libs/xml2-dynamic.lib - dlls/pcre.dll dlls/pcre2-8.dll dlls/iconv-2.dll dlls/gc.dll @@ -145,16 +139,13 @@ jobs: add-to-path: false - name: Build libgc if: steps.cache-dlls.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.8 -AtomicOpsVersion 7.8.2 -Dynamic - - name: Build libpcre - if: steps.cache-dlls.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-pcre.ps1 -BuildTree deps\pcre -Version 8.45 -Dynamic + run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.12 -AtomicOpsVersion 7.10.0 -Dynamic - name: Build libpcre2 if: steps.cache-dlls.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.45 -Dynamic + run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.47 -Dynamic - name: Build libiconv if: steps.cache-dlls.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.18 -Dynamic + run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.19 -Dynamic - name: Build libffi if: steps.cache-dlls.outputs.cache-hit != 'true' run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.4.7 -Dynamic @@ -169,7 +160,7 @@ jobs: run: .\etc\win-ci\build-yaml.ps1 -BuildTree deps\yaml -Version 0.2.5 -Dynamic - name: Build libxml2 if: steps.cache-dlls.outputs.cache-hit != 'true' - run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.13.6 -Dynamic + run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.15.3 -Dynamic - name: Cache OpenSSL id: cache-openssl-dlls diff --git a/.github/workflows/win_build_portable.yml b/.github/workflows/win_build_portable.yml index 1660e9eaccbd..b02b0e4b3d04 100644 --- a/.github/workflows/win_build_portable.yml +++ b/.github/workflows/win_build_portable.yml @@ -44,7 +44,6 @@ jobs: uses: actions/cache/restore@v5 with: path: | - libs/pcre.lib libs/pcre2-8.lib libs/iconv.lib libs/gc.lib @@ -69,7 +68,6 @@ jobs: uses: actions/cache/restore@v5 with: path: | - libs/pcre-dynamic.lib libs/pcre2-8-dynamic.lib libs/iconv-dynamic.lib libs/gc-dynamic.lib @@ -78,7 +76,6 @@ jobs: libs/mpir-dynamic.lib libs/yaml-dynamic.lib libs/xml2-dynamic.lib - dlls/pcre.dll dlls/pcre2-8.dll dlls/iconv-2.dll dlls/gc.dll diff --git a/etc/win-ci/build-mpir.ps1 b/etc/win-ci/build-mpir.ps1 index 24111e762b7b..aeead00d054e 100644 --- a/etc/win-ci/build-mpir.ps1 +++ b/etc/win-ci/build-mpir.ps1 @@ -6,7 +6,7 @@ param( . "$(Split-Path -Parent $MyInvocation.MyCommand.Path)\setup.ps1" [void](New-Item -Name (Split-Path -Parent $BuildTree) -ItemType Directory -Force) -Setup-Git -Path $BuildTree -Url https://github.com/BrianGladman/mpir.git -Ref dc82b0475dea84d5338356e49176c40be03a5bdf # master@{2023-02-10} +Setup-Git -Path $BuildTree -Url https://github.com/BrianGladman/mpir.git -Ref f84ce09218b91d4c4fdf26e75093918c9fdb7046 # master@{2026-02-25} Run-InDirectory $BuildTree { $vsVersion = "vs$((& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -property displayName) -replace '.*\b\d\d(\d\d)\b.*', '$1')" diff --git a/etc/win-ci/build-pcre.ps1 b/etc/win-ci/build-pcre.ps1 deleted file mode 100644 index ea021e309de2..000000000000 --- a/etc/win-ci/build-pcre.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -param( - [Parameter(Mandatory)] [string] $BuildTree, - [Parameter(Mandatory)] [string] $Version, - [switch] $Dynamic -) - -function Find-7Zip { - $Path = Get-Command "7z" -CommandType Application -TotalCount 1 -ErrorAction SilentlyContinue - if ($Path) { return $Path.Path } - - $Path = "$env:ProgramFiles\7-Zip\7z.exe" - if (Test-Path -Path $Path -PathType Leaf) { return $Path } - - $Path = "${env:ProgramFiles(x86)}\7-Zip\7z.exe" - if (Test-Path -Path $Path -PathType Leaf) { return $Path } - - Write-Host "Error: Cannot locate 7-Zip executable" -ForegroundColor Red - Exit 1 -} - -. "$(Split-Path -Parent $MyInvocation.MyCommand.Path)\setup.ps1" - -[void](New-Item -Name (Split-Path -Parent $BuildTree) -ItemType Directory -Force) -Invoke-WebRequest https://cs.stanford.edu/pub/exim/pcre/pcre-$Version.zip -OutFile pcre.zip -& (Find-7Zip) x pcre.zip -mv pcre-* $BuildTree -rm pcre.zip - -Run-InDirectory $BuildTree { - $args = "-DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DPCRE_BUILD_PCRECPP=OFF -DPCRE_SUPPORT_JIT=ON -DPCRE_SUPPORT_UNICODE_PROPERTIES=ON -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF" - if ($Dynamic) { - $args = "-DBUILD_SHARED_LIBS=ON $args" - } else { - $args = "-DBUILD_SHARED_LIBS=OFF -DPCRE_STATIC_RUNTIME=ON $args" - } - & $cmake . $args.split(' ') - & $cmake --build . --config Release - if (-not $?) { - Write-Host "Error: Failed to build PCRE" -ForegroundColor Red - Exit 1 - } -} - -if ($Dynamic) { - mv -Force $BuildTree\Release\pcre.lib libs\pcre-dynamic.lib - mv -Force $BuildTree\Release\pcre.dll dlls\ -} else { - mv -Force $BuildTree\Release\pcre.lib libs\ -} diff --git a/etc/win-ci/build-yaml.ps1 b/etc/win-ci/build-yaml.ps1 index 5f0972003f71..2341d74c5ede 100644 --- a/etc/win-ci/build-yaml.ps1 +++ b/etc/win-ci/build-yaml.ps1 @@ -10,7 +10,7 @@ param( Setup-Git -Path $BuildTree -Url https://github.com/yaml/libyaml.git -Ref $Version Run-InDirectory $BuildTree { - $args = "-DBUILD_TESTING=OFF -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF" + $args = "-DBUILD_TESTING=OFF -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.10" if ($Dynamic) { $args = "-DBUILD_SHARED_LIBS=ON $args" } else {