From 30e71ef265de7beeea8b36a270a353810b9ebfec Mon Sep 17 00:00:00 2001 From: DawoudSheraz Date: Thu, 9 May 2024 13:16:31 +0500 Subject: [PATCH] chore: remove git patches --- docs/configuration.rst | 2 +- tutor/__about__.py | 2 +- tutor/templates/build/openedx/Dockerfile | 7 ------- tutor/templates/config/defaults.yml | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 4897a46206..de164c123a 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -132,7 +132,7 @@ Open edX customisation This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option. -- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.1"``, or ``master`` in :ref:`nightly `) +- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.master"``, or ``master`` in :ref:`nightly `) This defines the default version that will be pulled from all Open edX git repositories. diff --git a/tutor/__about__.py b/tutor/__about__.py index 4924a76e74..8c37f09911 100644 --- a/tutor/__about__.py +++ b/tutor/__about__.py @@ -2,7 +2,7 @@ # Increment this version number to trigger a new release. See # docs/tutor.html#versioning for information on the versioning scheme. -__version__ = "17.0.6" +__version__ = "18.0.0" # The version suffix will be appended to the actual version, separated by a # dash. Use this suffix to differentiate between the actual released version and diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 65b7e6a2da..6df297b792 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -53,13 +53,6 @@ RUN git config --global user.email "tutor@overhang.io" \ # Patches in nightly node {%- else %} # 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 -# Security patch for "Privilege re-escalation in Studio after staff access removed" -# https://github.com/openedx/edx-platform/security/advisories/GHSA-99vw-2wrq-xh9x -# https://discuss.openedx.org/t/upcoming-security-fix-for-edx-platform-on-2024-05-17/13004 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/3ff69fd5813256f935f19c237ea0c42d4c16edbf.patch | git am {%- endif %} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/.patch | git am #} diff --git a/tutor/templates/config/defaults.yml b/tutor/templates/config/defaults.yml index a7f70c8948..b4dcc18660 100644 --- a/tutor/templates/config/defaults.yml +++ b/tutor/templates/config/defaults.yml @@ -61,7 +61,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_USERNAME: "openedx" # the common version will be automatically set to "master" in the nightly branch -OPENEDX_COMMON_VERSION: "open-release/redwood.1" +OPENEDX_COMMON_VERSION: "open-release/redwood.master" OPENEDX_EXTRA_PIP_REQUIREMENTS: [] MYSQL_HOST: "mysql" MYSQL_PORT: 3306