From a552fe9692f6853ec10306a8ef2331d8f5da6539 Mon Sep 17 00:00:00 2001 From: Krishnan Govindraj Date: Fri, 19 Jan 2024 12:59:07 +0000 Subject: [PATCH 1/4] WIP: Once each gherkin & messages release, we can move the dependencies from our fork --- cpp/test/cucumber/lib/runner.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cpp/test/cucumber/lib/runner.cpp b/cpp/test/cucumber/lib/runner.cpp index 4bf3943604..b0e7343f44 100644 --- a/cpp/test/cucumber/lib/runner.cpp +++ b/cpp/test/cucumber/lib/runner.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "cucumber_bdd/runner.hpp" @@ -44,10 +44,10 @@ std::string type_name(); void TestRunnerBase::loadFeature(const std::string& path) { // std::regex testFilter = std::regex(::testing::GTEST_FLAG(filter), std::regex::extended); - std::string featureContents = gherkin::slurp(path); - gherkin::parser parser; + std::string featureContents = cucumber::gherkin::slurp(path); + cucumber::gherkin::parser parser; cucumber::messages::gherkin_document doc = parser.parse(path, featureContents); - gherkin::pickle_compiler compiler; + cucumber::gherkin::pickle_compiler compiler; if (doc.feature.has_value()) { for (cucumber::messages::pickle scenario : compiler.compile(doc, path)) { From c325e2cf6c45a02ede95884de11afe5fb7cba7a4 Mon Sep 17 00:00:00 2001 From: Krishnan Govindraj Date: Wed, 27 Mar 2024 13:06:31 +0000 Subject: [PATCH 2/4] Bump dependencies to my fork for CI --- dependencies/vaticle/repositories.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index e6ddbaa60d..7db69cde72 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -20,8 +20,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") def vaticle_dependencies(): git_repository( name = "vaticle_dependencies", - remote = "https://github.com/vaticle/dependencies", - commit = "f3ab3f76e2f82f1f8b12464d95948b637f655f5d", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies + remote = "https://github.com/krishnangovindraj/dependencies", + commit = "8ce56244be31bdfb706c3b907456007a61a5edf9", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies ) def vaticle_typeql(): From 0f22858718decd81bb938131b02e966bbcc62035 Mon Sep 17 00:00:00 2001 From: Krishnan Govindraj Date: Wed, 3 Apr 2024 10:36:05 +0100 Subject: [PATCH 3/4] Point dependencies to merged vaticle/dependencies commit --- dependencies/vaticle/repositories.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 7db69cde72..e6ddbaa60d 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -20,8 +20,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") def vaticle_dependencies(): git_repository( name = "vaticle_dependencies", - remote = "https://github.com/krishnangovindraj/dependencies", - commit = "8ce56244be31bdfb706c3b907456007a61a5edf9", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies + remote = "https://github.com/vaticle/dependencies", + commit = "f3ab3f76e2f82f1f8b12464d95948b637f655f5d", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies ) def vaticle_typeql(): From 6daebc32c8db41c54bfd496debadbdeeddb2cd7b Mon Sep 17 00:00:00 2001 From: Krishnan Govindraj Date: Wed, 3 Apr 2024 16:22:24 +0100 Subject: [PATCH 4/4] Bump dependencies again to include json --- dependencies/vaticle/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index e6ddbaa60d..8c48178089 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -21,7 +21,7 @@ def vaticle_dependencies(): git_repository( name = "vaticle_dependencies", remote = "https://github.com/vaticle/dependencies", - commit = "f3ab3f76e2f82f1f8b12464d95948b637f655f5d", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies + commit = "a0a07919a96c56c565b9a4b5633c47d3d60c6ac3", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies ) def vaticle_typeql():