christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-10 00:37:54 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/master' into nightly

Browse Source
This commit is contained in:
Overhang.IO 2024-02-22 10:54:55 +00:00
commit c29eaa8caa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20240222_101904_regis_fix_nightly_patches.md Normal file
View File

@ -0,0 +1 @@
- [Bugfix] Fix merge conflicts in nightly when trying to apply patches from the master branch. (by @regisb)

4
tutor/templates/build/openedx/Dockerfile
View File

@ -49,8 +49,10 @@ 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 %}
# Patch edx-platform
# Patches in non-nightly mode
# 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