From 657aa29679d958faa4897bf4fd4722e30824b060 Mon Sep 17 00:00:00 2001 From: norareidy Date: Fri, 10 May 2024 12:25:13 -0400 Subject: [PATCH 1/3] DOCSP-37027: Additional build fixes 1.18 --- .gitmodules | 4 ++-- mongo-php-library | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index fc42715e..7d4f1a44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "mongo-php-library"] path = mongo-php-library - url = https://github.com/mongodb/mongo-php-library.git - branch = v1.18 + url = https://github.com/norareidy/mongo-php-library.git + branch = DOCSP-37027-more-fixes-1.18 diff --git a/mongo-php-library b/mongo-php-library index abf31748..91392486 160000 --- a/mongo-php-library +++ b/mongo-php-library @@ -1 +1 @@ -Subproject commit abf31748d250c755ebf6599e1f7b81a74fff04b5 +Subproject commit 91392486f96e2e045ff7778b57f7bb71a818e865 From 7aeae5e7794707058a088ff8aed5dcc1fca640ca Mon Sep 17 00:00:00 2001 From: norareidy Date: Fri, 10 May 2024 13:48:45 -0400 Subject: [PATCH 2/3] build --- .gitmodules | 2 +- mongo-php-library | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7d4f1a44..5ad04fc9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "mongo-php-library"] path = mongo-php-library url = https://github.com/norareidy/mongo-php-library.git - branch = DOCSP-37027-more-fixes-1.18 + branch = DOCSP-3702-v1.18 diff --git a/mongo-php-library b/mongo-php-library index 91392486..f52a25c9 160000 --- a/mongo-php-library +++ b/mongo-php-library @@ -1 +1 @@ -Subproject commit 91392486f96e2e045ff7778b57f7bb71a818e865 +Subproject commit f52a25c97bbe438d874037c75a4a6bc069fe11c5 From 155739c46049dda9d4409668e10a55f88b0a3e8f Mon Sep 17 00:00:00 2001 From: norareidy Date: Tue, 21 May 2024 13:36:07 -0400 Subject: [PATCH 3/3] update submodule --- .gitmodules | 4 ++-- mongo-php-library | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5ad04fc9..fc42715e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "mongo-php-library"] path = mongo-php-library - url = https://github.com/norareidy/mongo-php-library.git - branch = DOCSP-3702-v1.18 + url = https://github.com/mongodb/mongo-php-library.git + branch = v1.18 diff --git a/mongo-php-library b/mongo-php-library index f52a25c9..189700f7 160000 --- a/mongo-php-library +++ b/mongo-php-library @@ -1 +1 @@ -Subproject commit f52a25c97bbe438d874037c75a4a6bc069fe11c5 +Subproject commit 189700f78c721fbb178907eeb26cecb085c2fb18