From 354dfc654dbb5bc583c658629417d5d1038b7afa Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Mon, 12 Aug 2024 12:06:31 +0500 Subject: [PATCH 1/2] feat: update to redwood.2 --- changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md | 1 + docs/configuration.rst | 2 +- tutor/templates/build/openedx/Dockerfile | 5 ----- tutor/templates/config/defaults.yml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md diff --git a/changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md b/changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md new file mode 100644 index 0000000000..7142e3a7a1 --- /dev/null +++ b/changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md @@ -0,0 +1 @@ +- [Feature] Update to redwood.2 tag (by @dawoudsheraz) diff --git a/docs/configuration.rst b/docs/configuration.rst index 04daacffe3..0a276a954e 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.2"``, or ``master`` in :ref:`nightly `) This defines the default version that will be pulled from all Open edX git repositories. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 2e425705f7..dd2c2daf3c 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -53,11 +53,6 @@ RUN git config --global user.email "tutor@overhang.io" \ # Patches in nightly node {%- else %} # Patches in non-nightly mode -# Security patch around content library permissions -# https://discuss.openedx.org/t/security-upcoming-security-release-for-edx-platform-2024-07-25/13473 -# https://github.com/openedx/edx-platform/pull/35180 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/3160ff68ca4a4516375af3307fe84f22cd5e5b36.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..65a9de2983 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.2" OPENEDX_EXTRA_PIP_REQUIREMENTS: [] MYSQL_HOST: "mysql" MYSQL_PORT: 3306 From 3143335d69a7f9b012551d14838ea81101101551 Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Tue, 13 Aug 2024 12:00:43 +0500 Subject: [PATCH 2/2] v18.1.3 --- CHANGELOG.md | 5 +++++ changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md | 1 - tutor/__about__.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 80803702ca..e45209dfa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,11 @@ instructions, because git commits are used to generate release notes: + +## v18.1.3 (2024-08-13) + +- [Feature] Update to redwood.2 tag (by @dawoudsheraz) + ## v18.1.2 (2024-07-26) diff --git a/changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md b/changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md deleted file mode 100644 index 7142e3a7a1..0000000000 --- a/changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md +++ /dev/null @@ -1 +0,0 @@ -- [Feature] Update to redwood.2 tag (by @dawoudsheraz) diff --git a/tutor/__about__.py b/tutor/__about__.py index 202beaa4c8..2e02ccd7bb 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__ = "18.1.2" +__version__ = "18.1.3" # 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