From b56c83fded03321e3482164401ededeb4189aa49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20HORTA?= Date: Wed, 24 Nov 2021 14:47:53 +0100 Subject: [PATCH] Update vcpkg to fix Windows builds PCRE changed the download server, see https://github.com/microsoft/vcpkg/issues/21201 --- .github/workflows/ci-workflow.yml | 6 +++--- .github/workflows/release-windows.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 8be57af84..c855c1892 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 8d9af3f69..1a0e26fc5 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: ''