build: don't apply release patches in nightly #1044
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 master*, 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.
|
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 Then we can replace |
|
Sounds good! I presume that it's OK to determine the value of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
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.