From 3401a71b1899e0bd1d1ecf5591b66cc6e86941c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 22 Feb 2024 10:19:41 +0100 Subject: [PATCH] fix: merge conflicts due to edx-platform patches in nightly When building the nightly images, some patches fail because they come from the master branch. To address this, we apply certain patches only if we are not in nightly mode. --- changelog.d/20240222_101904_regis_fix_nightly_patches.md | 1 + tutor/templates/build/openedx/Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20240222_101904_regis_fix_nightly_patches.md diff --git a/changelog.d/20240222_101904_regis_fix_nightly_patches.md b/changelog.d/20240222_101904_regis_fix_nightly_patches.md new file mode 100644 index 0000000..4fc6e33 --- /dev/null +++ b/changelog.d/20240222_101904_regis_fix_nightly_patches.md @@ -0,0 +1 @@ +- [Bugfix] Fix merge conflicts in nightly when trying to apply patches from the master branch. (by @regisb) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 1cbad72..186867d 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -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