From 2247b397faefc8266e545bd86330d2192d6b6247 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 17 May 2022 17:25:56 -0700 Subject: [PATCH] [pegtl] Update to 3.2.6 for MSVC and GCC fixes (#24761) * [pegtl] Update to 3.2.6 for compiler fixes * vcpkg x-add-version --all * Remove cppgraphqlgen from baseline, as suggested in https://github.com/microsoft/vcpkg/pull/24761#issuecomment-1129414611 Co-authored-by: Billy Robert O'Neal III --- ports/pegtl/portfile.cmake | 6 +++--- ports/pegtl/vcpkg.json | 2 +- scripts/ci.baseline.txt | 6 ------ versions/baseline.json | 2 +- versions/p-/pegtl.json | 5 +++++ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 4183a10107b017..5746327c2bad58 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.5 - SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14 - HEAD_REF main + REF e65017d398a3b733aedab70bb64b8055472d47aa + SHA512 05ca3754a9c1c94a205c6823e4442dca1f11a890aadd4b0c96f6ccd8946eec061c0a723bc67f8b57b074154e1ab1171bdcdd035926f55e42b5517b9d5ecae873 + HEAD_REF 3.x ) vcpkg_cmake_configure( diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index b173e2ba83b201..e2455acb924f91 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pegtl", - "version-semver": "3.2.5", + "version-semver": "3.2.6", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 810e16e731099c..5130762e498a53 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -172,12 +172,6 @@ cpp-netlib:x64-uwp=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail -# VS 2022 17.2 miscompiles this: -cppgraphqlgen:arm64-windows=fail -cppgraphqlgen:x64-windows=fail -cppgraphqlgen:x64-windows-static=fail -cppgraphqlgen:x64-windows-static-md=fail -cppgraphqlgen:x86-windows=fail # The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. # This is known to work on x64-linux as of gcc 10.3.0. cppgraphqlgen:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index e49220b9afcc12..cce2918afe93b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5377,7 +5377,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.5", + "baseline": "3.2.6", "port-version": 0 }, "pegtl-2": { diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index dae6a54d3cd697..45bf43ca6c7371 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed96fd80f2820b9e5ad6f38a9ea24d7aebfb64be", + "version-semver": "3.2.6", + "port-version": 0 + }, { "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", "version-semver": "3.2.5",