tutor icon indicating copy to clipboard operation
tutor copied to clipboard

build: don't apply release patches in nightly

Open kdmccormick opened this issue 1 year ago • 2 comments

The Dockerfile applies some patches to edx-platform. These patches are only meant to work on named releases. So, the Dockerfile avoids applying the patches to Nightly by checking if EDX_PLATFORM_VERSION is "master"

However, people running Nightly will often use a branch off of edx-platform master, causing that conditional to miss, which will lead to build errors like this:

ERROR: failed to solve: process "/bin/sh -c curl -fsSL https://github.com/openedx/edx-platform/commit/ad201cd664b6c722cbefcbda23ae390c06daf621.patch | git am" did not complete successfully: exit code: 128

As a solution, we simply will remove the patches from Tutor's nightly branch. We can also remove the same conditional from Tutor's master branch.

kdmccormick avatar Apr 18 '24 17:04 kdmccormick

This is not a super robust solution, as it means we need to open a PR in nightly each time a patch lands in master. I suggest instead to define a IS_NIGHTLY variable (I'm open to other names): note that this variable would not be a configuration setting, but a variable available at template rendering time.

Then we can replace {%- elif EDX_PLATFORM_VERSION == "master" %} by {%- elif IS_NIGHTLY %}.

regisb avatar Apr 18 '24 20:04 regisb

Sounds good! I presume that it's OK to determine the value of IS_NIGHTLY by looking at tutor.__about__.__app__.__version_suffix__? I can take care of that.

kdmccormick avatar Apr 18 '24 20:04 kdmccormick

Closed in favor of https://github.com/overhangio/tutor/pull/1153

kdmccormick avatar Nov 07 '24 20:11 kdmccormick