From 17112b34b4ba050b56c4ef9876ec03ac4597d1e3 Mon Sep 17 00:00:00 2001 From: Carson Tam Date: Thu, 21 Nov 2024 21:16:33 -0800 Subject: [PATCH 1/3] Add moodle-plagiarism_turnitin plugin with tag v2024072401. --- .gitmodules | 5 +++++ plagiarism/turnitin | 1 + 2 files changed, 6 insertions(+) create mode 160000 plagiarism/turnitin diff --git a/.gitmodules b/.gitmodules index 5258c4e237ba2..a1af8ae004e0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -112,6 +112,11 @@ url = https://github.com/ncstate-delta/moodle-mod_zoom branch = main tag = v5.2.4 +[submodule "plagiarism/turnitin"] + path = plagiarism/turnitin + url = https://github.com/turnitin/moodle-plagiarism_turnitin + branch = master + tag = v2024072401 [submodule "question/type/knowledgecheck"] path = question/type/knowledgecheck url = https://github.com/ucsf-education/knowledgecheck.git diff --git a/plagiarism/turnitin b/plagiarism/turnitin new file mode 160000 index 0000000000000..362f7539584fc --- /dev/null +++ b/plagiarism/turnitin @@ -0,0 +1 @@ +Subproject commit 362f7539584fcefb4a06df0964e58a8c6af0bf0e From c20277d3b6d6c2b6399a229cfd329ba64d664258 Mon Sep 17 00:00:00 2001 From: Carson Tam Date: Fri, 22 Nov 2024 10:22:01 -0800 Subject: [PATCH 2/3] Update moodle-plagiarism_turnitin plugin to use the tip of its master branch, instead of the v2024072401 tag, to fix failing tests. --- .gitmodules | 1 - plagiarism/turnitin | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a1af8ae004e0d..d98f75d61096e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -116,7 +116,6 @@ path = plagiarism/turnitin url = https://github.com/turnitin/moodle-plagiarism_turnitin branch = master - tag = v2024072401 [submodule "question/type/knowledgecheck"] path = question/type/knowledgecheck url = https://github.com/ucsf-education/knowledgecheck.git diff --git a/plagiarism/turnitin b/plagiarism/turnitin index 362f7539584fc..ffa502cc992da 160000 --- a/plagiarism/turnitin +++ b/plagiarism/turnitin @@ -1 +1 @@ -Subproject commit 362f7539584fcefb4a06df0964e58a8c6af0bf0e +Subproject commit ffa502cc992dabc8eeed7f10a1094c5a2772366d From f18373f1e4ae22638685d03a47cfeb4bf31e00c8 Mon Sep 17 00:00:00 2001 From: Carson Tam Date: Fri, 22 Nov 2024 13:45:14 -0800 Subject: [PATCH 3/3] Switch to use our forked repo, ucsf-education/moodle-plagiarism_turnitin to address failing tests in GHA. - Using the same branch, UCSFCLE_403_STABLE, for our Moodle 4.4, since there has been no update since their v2024072401 release. - Cherry-picked commit [23fb73b](https://github.com/catalyst/moodle-plagiarism_turnitin/commit/23fb73b0d0356b5940793f8e0bcd61dd4029136d) that addressed turnitin/moodle-plagiarism_turnitin#683 and turnitin/moodle-plagiarism_turnitin#712. --- .gitmodules | 4 ++-- plagiarism/turnitin | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d98f75d61096e..e703b6186542e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -114,8 +114,8 @@ tag = v5.2.4 [submodule "plagiarism/turnitin"] path = plagiarism/turnitin - url = https://github.com/turnitin/moodle-plagiarism_turnitin - branch = master + url = https://github.com/ucsf-education/moodle-plagiarism_turnitin + branch = UCSFCLE_403_STABLE [submodule "question/type/knowledgecheck"] path = question/type/knowledgecheck url = https://github.com/ucsf-education/knowledgecheck.git diff --git a/plagiarism/turnitin b/plagiarism/turnitin index ffa502cc992da..49f12064f4a04 160000 --- a/plagiarism/turnitin +++ b/plagiarism/turnitin @@ -1 +1 @@ -Subproject commit ffa502cc992dabc8eeed7f10a1094c5a2772366d +Subproject commit 49f12064f4a04fab38ac99cf19ed40952d6d818e