From 2d570df955ba43462d3d6479b7968e422c3c0c13 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 17 Jul 2024 20:04:45 -0700 Subject: [PATCH 1/4] Update vcpkg baseline --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 69570624..6ecae9f0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -49,5 +49,5 @@ "dependencies": [ "pegtl" ], - "builtin-baseline": "a618637937298060bdbe5fbcfb628eabd1082c8a" + "builtin-baseline": "1318ab14aae14db20085441cd71366891a9c9d0c" } From 6713d7733eb2dfff9c8021b312b0f470c80ce68a Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 17 Jul 2024 20:06:07 -0700 Subject: [PATCH 2/4] Fix #302 --- include/graphqlservice/internal/Grammar.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/graphqlservice/internal/Grammar.h b/include/graphqlservice/internal/Grammar.h index fc420d54..95ee999b 100644 --- a/include/graphqlservice/internal/Grammar.h +++ b/include/graphqlservice/internal/Grammar.h @@ -453,9 +453,7 @@ struct field_selection_set : seq, selection_set> { }; -struct field_content - : sor, field_selection_set>, - seq, field_arguments> +struct field_content : seq, opt> { }; From ad7f7a9e89c49d23114de5841b3179087db7d81f Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 17 Jul 2024 20:21:26 -0700 Subject: [PATCH 3/4] Rollback vcpkg baseline to latest commit in hosted runners --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 6ecae9f0..7c62b562 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -49,5 +49,5 @@ "dependencies": [ "pegtl" ], - "builtin-baseline": "1318ab14aae14db20085441cd71366891a9c9d0c" + "builtin-baseline": "7aeffc91033ad35cc4e2c152f213a866ec6c11ac" } From b04960584659894b72d01867ce53b7d801f74bb0 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 17 Jul 2024 21:28:35 -0700 Subject: [PATCH 4/4] Bump the patch version for another release --- cmake/version.txt | 2 +- include/graphqlservice/internal/Version.h | 4 ++-- res/ClientGen.rc | 4 ++-- res/SchemaGen.rc | 4 ++-- res/graphqlclient_version.rc | 4 ++-- res/graphqljson_version.rc | 4 ++-- res/graphqlpeg_version.rc | 4 ++-- res/graphqlresponse_version.rc | 4 ++-- res/graphqlservice_version.rc | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmake/version.txt b/cmake/version.txt index 2733e926..0c8d4d7e 100644 --- a/cmake/version.txt +++ b/cmake/version.txt @@ -1 +1 @@ -4.5.6 \ No newline at end of file +4.5.7 \ No newline at end of file diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h index f0c3e59d..910616a7 100644 --- a/include/graphqlservice/internal/Version.h +++ b/include/graphqlservice/internal/Version.h @@ -10,11 +10,11 @@ namespace graphql::internal { -constexpr std::string_view FullVersion { "4.5.6" }; +constexpr std::string_view FullVersion { "4.5.7" }; constexpr size_t MajorVersion = 4; constexpr size_t MinorVersion = 5; -constexpr size_t PatchVersion = 6; +constexpr size_t PatchVersion = 7; } // namespace graphql::internal diff --git a/res/ClientGen.rc b/res/ClientGen.rc index 39818c17..ca4ce5ef 100644 --- a/res/ClientGen.rc +++ b/res/ClientGen.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc index db8d8b76..9209877b 100644 --- a/res/SchemaGen.rc +++ b/res/SchemaGen.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc index 307f5e9c..7982adbf 100644 --- a/res/graphqlclient_version.rc +++ b/res/graphqlclient_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc index bc972e95..df42fdf7 100644 --- a/res/graphqljson_version.rc +++ b/res/graphqljson_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc index 9cc5e48f..fb0db20e 100644 --- a/res/graphqlpeg_version.rc +++ b/res/graphqlpeg_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc index 40143dec..fe25318f 100644 --- a/res/graphqlresponse_version.rc +++ b/res/graphqlresponse_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc index f6b41984..01731b41 100644 --- a/res/graphqlservice_version.rc +++ b/res/graphqlservice_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,6,0 -#define GRAPHQL_RC_VERSION_STR "4.5.6" +#define GRAPHQL_RC_VERSION 4,5,7,0 +#define GRAPHQL_RC_VERSION_STR "4.5.7" #ifndef DEBUG #define VER_DEBUG 0