Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: don't apply release patches in nightly #1044

Closed
wants to merge 1 commit into from
Closed

build: don't apply release patches in nightly #1044

wants to merge 1 commit into from

Commits on Apr 18, 2024

  1. build: don't apply release patches in nightly 

    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.
    @kdmccormick
    kdmccormick authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    451079f View commit details
    Browse the repository at this point in the history