Skip to content

Commit 67d65cc

Browse files
committed
feat!: Rename branches master->release, nightly->main
1 parent ee2355f commit 67d65cc

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

.github/workflows/sync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Sync with private repo
22

33
on:
44
push:
5-
branches: [ master, main, nightly ]
5+
branches: [ release, main ]
66

77
jobs:
88
sync:

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run tests
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches: [release, main]
66

77
jobs:
88
tests:

README.rst

+16-15
Original file line numberDiff line numberDiff line change
@@ -42,79 +42,79 @@ To check what the current value of `MFE_HOST` is actually set to, run::
4242
Authn
4343
~~~~~
4444

45-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/authn.png
45+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/authn.png
4646
:alt: Authn MFE screenshot
4747

4848
This is a micro-frontend application responsible for the login, registration and password reset functionality.
4949

5050
Account
5151
~~~~~~~
5252

53-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/account.png
53+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/account.png
5454
:alt: Account MFE screenshot
5555

5656
An MFE to manage account-specific information for every LMS user. Each user's account page is available at ``http(s)://{{ MFE_HOST }}/account``. For instance, when running locally: https://apps.local.edly.io/account.
5757

5858
Communications
5959
~~~~~~~~~~~~~~
6060

61-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/communications.png
61+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/communications.png
6262
:alt: Communications MFE screenshot
6363

6464
The Communications micro-frontend exposes an interface for course teams to communicate with learners. It achieves this by allowing instructors to send out emails in bulk, either by scheduling them or on demand.
6565

6666
Course Authoring
6767
~~~~~~~~~~~~~~~~
6868

69-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/course-authoring.png
69+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/course-authoring.png
7070
:alt: Course Authoring MFE screenshot
7171

7272
This MFE is meant for course authors and maintainers. For a given course, it exposes a "Pages & Resources" menu in Studio where one can enable or disable a variety of features, including, for example, the Wiki and Discussions. Optionally, it allows authors to replace the legacy HTML, Video, and Problem authoring tools with experimental React-based versions, as well as exposing a new proctoring interface that can be enabled if the `edx-exams <https://github.com/edx/edx-exams>`_ service is available.
7373

7474
Discussions
7575
~~~~~~~~~~~
7676

77-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/discussions.png
77+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/discussions.png
7878
:alt: Discussions MFE screenshot
7979

8080
The Discussions MFE updates the previous discussions UI with a new look and better features.
8181

8282
Gradebook
8383
~~~~~~~~~
8484

85-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/gradebook.png
85+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/gradebook.png
8686
:alt: Gradebook MFE screenshot
8787

8888
This instructor-only MFE is for viewing individual and aggregated grade results for a course. To access this MFE, go to a course → Instructor tab → Student Admin → View gradebook. The URL should be: ``http(s)://{{ MFE_HOST }}/gradebook/{{ course ID }}``. When running locally, the gradebook of the demo course is available at: http://apps.local.edly.io/gradebook/course-v1:edX+DemoX+Demo_Course
8989

9090
Learner Dashboard
9191
~~~~~~~~~~~~~~~~~
9292

93-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/learner-dashboard.png
93+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/learner-dashboard.png
9494
:alt: Learner Dashboard MFE screenshot
9595

9696
The Learner Dashboard MFE provides a clean and functional interface to allow learners to view all of their open enrollments, as well as take relevant actions on those enrollments.
9797

9898
Learning
9999
~~~~~~~~
100100

101-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/learning.png
101+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/learning.png
102102
:alt: Learning MFE screenshot
103103

104104
The Learning MFE replaces the former courseware, which is the core part of the LMS where students follow courses.
105105

106106
ORA Grading
107107
~~~~~~~~~~~
108108

109-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/ora-grading.png
109+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/ora-grading.png
110110
:alt: ORA Grading MFE screenshot
111111

112112
When enabled, Open Response Assessments ("ORA") that have a staff grading step will link to this new MFE, either when clicking "Grade Available Responses" from the exercise itself, or via a link in the Instructor Dashboard. It is meant to streamline the grading process with better previews of submitted content.
113113

114114
Profile
115115
~~~~~~~
116116

117-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/profile.png
117+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/profile.png
118118
:alt: Profile MFE screenshot
119119

120120
Edit and display user-specific profile information. The profile page of every user is visible at ``http(s)://{{ MFE_HOST }}/profile/u/{{ username }}``. For instance, when running locally, the profile page of the "admin" user is: http://apps.local.edly.io/profile/u/admin.
@@ -177,7 +177,7 @@ The ``make pull_translations`` command passes the ``ATLAS_OPTIONS`` environment
177177
Translations in the MFE plugin as well as other Tutor plugins can be customized with the following configuration
178178
variables:
179179

180-
- ``ATLAS_REVISION`` (default: ``"main"`` on nightly and ``"{{ OPENEDX_COMMON_VERSION }}"`` if a named release is used)
180+
- ``ATLAS_REVISION`` (default: ``"main"`` on main and ``"{{ OPENEDX_COMMON_VERSION }}"`` if a named release is used)
181181
- ``ATLAS_REPOSITORY`` (default: ``"openedx/openedx-translations"``).
182182
- ``ATLAS_OPTIONS`` (default: ``""``) Pass additional arguments to ``atlas pull``. Refer to the `atlas documentations <https://github.com/openedx/openedx-atlas>`_ for more information.
183183

@@ -533,17 +533,18 @@ NPM Dependency Conflict When overriding ``@edx/frontend-component-header`` or ``
533533
When there is a need to customize the ``@edx/frontend-component-header`` or ``@edx/frontend-component-footer`` component, there is a chance that npm dependency conflicts can occur. In the case of such a conflict, perform the following to resolve the conflicts while keeping the customizations in place:
534534

535535
1. Identify your openedx version, for example, ``quince``.
536-
2. Navigate to `Learning <https://github.com/openedx/frontend-app-learning>`_ and `Learner Dashboard <https://github.com/openedx/frontend-app-learner-dashboard>`_ MFEs repositories and checkout to branch ``open-release/quince.master``. Inspect which header and footer versions are installed from ``package.json``. Learning and Learner Dashboard MFEs are mentioned only as an example. Hence, This step can be applied to all MFEs.
536+
2. Navigate to `Learning <https://github.com/openedx/frontend-app-learning>`_ and `Learner Dashboard <https://github.com/openedx/frontend-app-learner-dashboard>`_ MFEs repositories and checkout to branch ``open-release/quince.master
537+
``. Inspect which header and footer versions are installed from ``package.json``. Learning and Learner Dashboard MFEs are mentioned only as an example. Hence, This step can be applied to all MFEs.
537538
3. Determine the versions of ``@edx/frontend-platform`` used in MFEs. Also, check that the header/footer you plan to customize is compatible with the same version of ``@edx/frontend-platform`` specified in their ``package.json`` file (peer-dependencies).
538539
4. Ensure consistency between the versions. For example, If MFE has ``@edx/frontend-platform: 7.0.1``, then customize the header/footer component which has ``@edx/frontend-platform: ^7.0.0`` in ``package.json`` under peer-dependencies
539540
5. Checkout to that specific tag (e.g: ``v7.0.0``) of header component and customize it
540541
6. Install the customized header/footer components into your MFEs. This will resolve any npm dependency conflict issues.
541542
7. All the steps outlined above need to be followed for the footer as well, if you have followed them for the header or vice versa.
542543

543-
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/master/media/npm-conflict-deps.png
544+
.. image:: https://raw.githubusercontent.com/overhangio/tutor-mfe/release/media/npm-conflict-deps.png
544545
:alt: Observation of MFE header and footer versions
545546

546-
From the above image, it can be observed that ``master`` branch of Learning MFE uses ``@edx/[email protected]`` and Discussions MFE uses ``@edx/[email protected]``. If customized header is created from ``master`` branch, it ensures compatibility with the Discussions MFE as header module supports ``@edx/platform@^7.0.0``. However, the customized header triggers npm dependencies conflit error for learning MFE.
547+
From the above image, it can be observed that ``master`` branch of Learning MFE uses ``@edx/[email protected]`` and Discussions MFE uses ``@edx/[email protected]``. If customized header is created from ``master`` branch, it ensures compatibility with the Discussions MFE as header module supports ``@edx/platform@^7.0.0``. However, the customized header triggers npm dependencies conflit error for learning MFE.
547548
In this case, checkout custom branch from ``v4.11.1`` of header for Learning MFE and ``v5.0.0`` for Discussions MFE. You can install your customized header versions in their respective MFEs as shown below::
548549

549550
hooks.Filters.ENV_PATCHES.add_items(
@@ -569,4 +570,4 @@ This Tutor plugin is maintained by Adolfo Brandes from `tCRIL <https://openedx.o
569570
License
570571
-------
571572

572-
This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-mfe/blob/master/LICENSE.txt>`_.
573+
This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-mfe/blob/release/LICENSE.txt>`_.

tutormfe/plugin.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from .__about__ import __version__
1616
from .hooks import MFE_APPS, MFE_ATTRS_TYPE
1717

18-
# Handle version suffix in nightly mode, just like tutor core
18+
# Handle version suffix in main mode, just like tutor core
1919
if __version_suffix__:
2020
__version__ += "-" + __version_suffix__
2121

@@ -235,15 +235,15 @@ def _build_3rd_party_dev_mfes_on_launch(
235235
image_names: list[str], context_name: t.Literal["local", "dev"]
236236
) -> list[str]:
237237
if __version_suffix__:
238-
# Build mfe image in nightly mode
238+
# Build mfe image in main mode
239239
image_names.append("mfe")
240240

241241
for mfe_name, _mfe_attrs in iter_mfes():
242242
if __version_suffix__ or (
243243
context_name == "dev" and mfe_name not in CORE_MFE_APPS
244244
):
245245
# We build MFE images:
246-
# - in nightly
246+
# - in main
247247
# - in development for non-core apps
248248
image_names.append(f"{mfe_name}-dev")
249249
return image_names

0 commit comments

Comments
 (0)