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.

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

feat!: Rename branches master->release, nightly->main #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Sync with private repo

on:
push:
branches: [ master, main, nightly ]
branches: [ release, main ]

jobs:
sync:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Run tests

on:
pull_request:
branches: [master]
branches: [ release, main ]
push:
branches: [ release, main ]

jobs:
tests:
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Grade the submission (in this case, mark it as being correct)::

The submission should then appear as correct with the message that you provided on the command line:

.. image:: https://github.com/overhangio/tutor-xqueue/raw/master/screenshots/correctanswer.png
.. image:: https://github.com/overhangio/tutor-xqueue/raw/release/screenshots/correctanswer.png
:alt: Correct answer
:align: center

Expand Down Expand Up @@ -128,7 +128,7 @@ Feel free to add breakpoints (``breakpoint()``) anywhere in your source code to
License
-------

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

Troubleshooting
---------------
Expand Down
3 changes: 3 additions & 0 deletions changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz):
* Rename **master** to **release**, as this branch runs the latest official Open edX release tag.
* Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.
2 changes: 1 addition & 1 deletion tutorxqueue/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from .__about__ import __version__

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

Expand Down