2024-09-21 00:49:02 +00:00
2 changed files with 1 additions and 4 deletions
--- a/changelog.d/20240222_101904_regis_fix_nightly_patches.md
+++ b/changelog.d/20240222_101904_regis_fix_nightly_patches.md
@ -1 +0,0 @@
- [Bugfix] Fix merge conflicts in nightly when trying to apply patches from the master branch. (by @regisb)
--- a/tutor/templates/build/openedx/Dockerfile
+++ b/tutor/templates/build/openedx/Dockerfile
@ -49,10 +49,8 @@ RUN git config --global user.email "tutor@overhang.io" \
 {%- if patch("openedx-dockerfile-git-patches-default") %}
 # Custom edx-platform patches
 {{ patch("openedx-dockerfile-git-patches-default") }}
-{%- elif EDX_PLATFORM_VERSION == "master" %}
-# Patches in nightly node
 {%- else %}
-# Patches in non-nightly mode
+# Patch edx-platform
 # Prevent course structure cache infinite growth
 # https://github.com/openedx/edx-platform/pull/34210
 RUN curl -fsSL https://github.com/openedx/edx-platform/commit/ad201cd664b6c722cbefcbda23ae390c06daf621.patch | git am
				`@ -1 +0,0 @@`
				`- [Bugfix] Fix merge conflicts in nightly when trying to apply patches from the master branch. (by @regisb)`