From: François HORTA Date: Wed, 24 Nov 2021 13:47:53 +0000 (+0100) Subject: Update vcpkg to fix Windows builds X-Git-Tag: v1.8.0~13^2~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b56c83fded03321e3482164401ededeb4189aa49;p=thirdparty%2Frrdtool-1.x.git Update vcpkg to fix Windows builds PCRE changed the download server, see https://github.com/microsoft/vcpkg/issues/21201 --- diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 8be57af8..c855c189 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -46,14 +46,14 @@ jobs: include: - os: windows-2019 triplet: x64-windows - # https://github.com/microsoft/vcpkg/commit/b361c2eefa3966cb7cec45275aff32e90430aaa6 - vcpkgCommitId: 'b361c2eefa3966cb7cec45275aff32e90430aaa6' + # https://github.com/microsoft/vcpkg/commit/70033dbb31527fb3e69654731f540f59c87787f9 + vcpkgCommitId: '70033dbb31527fb3e69654731f540f59c87787f9' vcpkgPackages: 'cairo expat fontconfig freetype gettext glib libpng libxml2 pango pcre zlib' configuration: 'x64' nmake_configuration: 'USE_64BIT=1' - os: windows-2019 triplet: x86-windows - vcpkgCommitId: 'b361c2eefa3966cb7cec45275aff32e90430aaa6' + vcpkgCommitId: '70033dbb31527fb3e69654731f540f59c87787f9' vcpkgPackages: 'cairo expat fontconfig freetype gettext glib libpng libxml2 pango pcre zlib' configuration: 'x86' nmake_configuration: '' diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 8d9af3f6..1a0e26fc 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -25,14 +25,14 @@ jobs: include: - os: windows-2019 triplet: x64-windows - # https://github.com/microsoft/vcpkg/commit/b361c2eefa3966cb7cec45275aff32e90430aaa6 - vcpkgCommitId: 'b361c2eefa3966cb7cec45275aff32e90430aaa6' + # https://github.com/microsoft/vcpkg/commit/70033dbb31527fb3e69654731f540f59c87787f9 + vcpkgCommitId: '70033dbb31527fb3e69654731f540f59c87787f9' vcpkgPackages: 'cairo expat fontconfig freetype gettext glib libpng libxml2 pango pcre zlib' configuration: 'x64' nmake_configuration: 'USE_64BIT=1' - os: windows-2019 triplet: x86-windows - vcpkgCommitId: 'b361c2eefa3966cb7cec45275aff32e90430aaa6' + vcpkgCommitId: '70033dbb31527fb3e69654731f540f59c87787f9' vcpkgPackages: 'cairo expat fontconfig freetype gettext glib libpng libxml2 pango pcre zlib' configuration: 'x86' nmake_configuration: ''