From dd289e12eb6f7540e9b94d42797480d8e85a6701 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 09:01:04 +0200 Subject: [PATCH 01/14] Added nested-books as submodule --- .gitmodules | 3 +++ book/external/Nested-Books | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 book/external/Nested-Books diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5951351 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "book/external/Nested-Books"] + path = book/external/Nested-Books + url = git@github.com:TeachBooks/Nested-Books.git diff --git a/book/external/Nested-Books b/book/external/Nested-Books new file mode 160000 index 0000000..8ea5a17 --- /dev/null +++ b/book/external/Nested-Books @@ -0,0 +1 @@ +Subproject commit 8ea5a179daab16358ebcf1620638479fe5fdeea1 From eb4973e8e440f025081a9452df5d6e641d239351 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 09:12:46 +0200 Subject: [PATCH 02/14] Added nested books --- book/_toc.yml | 1 + book/external/Nested-Books | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/book/_toc.yml b/book/_toc.yml index 6c77dc0..4ff54db 100644 --- a/book/_toc.yml +++ b/book/_toc.yml @@ -35,6 +35,7 @@ parts: - file: features/remove_from_publish - file: features/custom_toc.md - file: features/custom_download.md + - file: external/Nested-Books/README.md - file: features/interactive_element.ipynb sections: - file: features/grasple.md diff --git a/book/external/Nested-Books b/book/external/Nested-Books index 8ea5a17..0274cf7 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit 8ea5a179daab16358ebcf1620638479fe5fdeea1 +Subproject commit 0274cf7cce4e0ff084de4b131d5b3b30c3a697c0 From 8a6b3d765af5d1165a8da5438981b1245ad96365 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 09:50:52 +0200 Subject: [PATCH 03/14] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a086873..7eb347c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: REGISTRY_HOST: localhost:5000 TAG_LATEST: $REGISTRY_HOST/$CI_PROJECT_NAME/$CI_COMMIT_REF_NAME:latest TAG_DRAFT: $REGISTRY_HOST/$CI_PROJECT_NAME-draft/$CI_COMMIT_REF_NAME:latest + GIT_SUBMODULE_STRATEGY: recursive # For submodules cache: paths: @@ -72,4 +73,4 @@ deploy-draft: - docker run -d --restart always -p 8018:8000 --name $CI_PROJECT_NAME-draft $TAG_DRAFT environment: name: draft - url: https://interactivetextbooks.citg.tudelft.nl/jupyter-book-manual-draft \ No newline at end of file + url: https://interactivetextbooks.citg.tudelft.nl/jupyter-book-manual-draft From 1df6569ac2ffb4a95dffb4b750973f18e638bcfb Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 09:53:05 +0200 Subject: [PATCH 04/14] Update Nested-Books --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index 0274cf7..a98345b 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit 0274cf7cce4e0ff084de4b131d5b3b30c3a697c0 +Subproject commit a98345bafa00136601f19179c90957c8fcbdfe0b From ef68ce68ec0ab18cc4297eebd746505ba6d83c61 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 09:55:46 +0200 Subject: [PATCH 05/14] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5951351..a9a8d24 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "book/external/Nested-Books"] path = book/external/Nested-Books - url = git@github.com:TeachBooks/Nested-Books.git + url = https://github.com/TeachBooks/Nested-Books.git \ No newline at end of file From fa723bcfba04e659ebbf974be44fd0508557b347 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:12:04 +0200 Subject: [PATCH 06/14] Fixed typo in nested-books --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index a98345b..cf301b2 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit a98345bafa00136601f19179c90957c8fcbdfe0b +Subproject commit cf301b2d05cc065cbb589ae3b9558c606abd5b50 From 04ae2b394326dacf14327828a9348c00d894a1a5 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:19:21 +0200 Subject: [PATCH 07/14] Updated nested-book page --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index cf301b2..d66be66 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit cf301b2d05cc065cbb589ae3b9558c606abd5b50 +Subproject commit d66be663197bcc3e0b371d867126d6693ec8045c From ba0f03e47565db2642a673babdc026548dc5e217 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:42:55 +0200 Subject: [PATCH 08/14] Updated with figure --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index d66be66..e849899 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit d66be663197bcc3e0b371d867126d6693ec8045c +Subproject commit e8498996d087993e30f5cf95cbf099f924263194 From 33dc0e765425ddfb79d9e41798112bb8def466f1 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:44:57 +0200 Subject: [PATCH 09/14] Added template as external aswell --- .gitmodules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index a9a8d24..b05a5da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "book/external/Nested-Books"] path = book/external/Nested-Books - url = https://github.com/TeachBooks/Nested-Books.git \ No newline at end of file + url = https://github.com/TeachBooks/Nested-Books.git +[submodule "book/external/template"] + path = book/external/template + url = https://github.com/TeachBooks/template.git From 6ad843a357abd82d8f7223c303d87551404d491f Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:54:20 +0200 Subject: [PATCH 10/14] Fix submodule? --- .gitmodules | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b05a5da..a9a8d24 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "book/external/Nested-Books"] path = book/external/Nested-Books - url = https://github.com/TeachBooks/Nested-Books.git -[submodule "book/external/template"] - path = book/external/template - url = https://github.com/TeachBooks/template.git + url = https://github.com/TeachBooks/Nested-Books.git \ No newline at end of file From 67e8a011c15112fb130d4ce833d33113c34cce02 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:56:48 +0200 Subject: [PATCH 11/14] Update Nested-Books --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index e849899..d66be66 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit e8498996d087993e30f5cf95cbf099f924263194 +Subproject commit d66be663197bcc3e0b371d867126d6693ec8045c From d70fef0c1b4f1612591df57a1205962eb9837a9b Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 11:58:57 +0200 Subject: [PATCH 12/14] Update Nested-Books --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index d66be66..c4448a3 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit d66be663197bcc3e0b371d867126d6693ec8045c +Subproject commit c4448a3a9f9f5bb81eaa03fe467b98b5b96b403e From 0c5113223ec058629ad23e7f4a276554b1c12a1d Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 12:00:15 +0200 Subject: [PATCH 13/14] Added template repo as submodule --- .gitmodules | 5 ++++- book/external/template | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 book/external/template diff --git a/.gitmodules b/.gitmodules index a9a8d24..b05a5da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "book/external/Nested-Books"] path = book/external/Nested-Books - url = https://github.com/TeachBooks/Nested-Books.git \ No newline at end of file + url = https://github.com/TeachBooks/Nested-Books.git +[submodule "book/external/template"] + path = book/external/template + url = https://github.com/TeachBooks/template.git diff --git a/book/external/template b/book/external/template new file mode 160000 index 0000000..10eaf6c --- /dev/null +++ b/book/external/template @@ -0,0 +1 @@ +Subproject commit 10eaf6cf003404f7b56638161ef7c7f7aa38af37 From b17cdb8c17469c795a83e66e17ed23972407ddde Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Wed, 17 Apr 2024 12:12:48 +0200 Subject: [PATCH 14/14] Update Nested-Books --- book/external/Nested-Books | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/external/Nested-Books b/book/external/Nested-Books index c4448a3..d3f9001 160000 --- a/book/external/Nested-Books +++ b/book/external/Nested-Books @@ -1 +1 @@ -Subproject commit c4448a3a9f9f5bb81eaa03fe467b98b5b96b403e +Subproject commit d3f900177406debf040e5c8e6b6945d047444f5d