From: Wolfgang Stöggl Date: Sun, 12 Dec 2021 14:17:21 +0000 (+0100) Subject: Update vcpkg in Windows GitHub Actions X-Git-Tag: v1.8.0~14 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8574e4a2b0c569958150b7a51e6cc327c3ebbac9;p=thirdparty%2Frrdtool-1.x.git Update vcpkg in Windows GitHub Actions - Update vcpkg to current commit 50fd3d9 - Fix pcre download error. Former ftp.pcre.org FTP site is no longer available --- diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 8be57af8..6b4610dc 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/50fd3d9957195575849a49fa591e645f1d8e7156 + vcpkgCommitId: '50fd3d9957195575849a49fa591e645f1d8e7156' 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: '50fd3d9957195575849a49fa591e645f1d8e7156' 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..117ab43c 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/50fd3d9957195575849a49fa591e645f1d8e7156 + vcpkgCommitId: '50fd3d9957195575849a49fa591e645f1d8e7156' 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: '50fd3d9957195575849a49fa591e645f1d8e7156' vcpkgPackages: 'cairo expat fontconfig freetype gettext glib libpng libxml2 pango pcre zlib' configuration: 'x86' nmake_configuration: ''