From a42b22d9ea0bfaf5abb5251a295bfd8e8ceecad1 Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Tue, 19 Nov 2024 17:00:23 +0500 Subject: [PATCH] feat!: Rename branches master->release, nightly->main --- .github/workflows/sync.yml | 2 +- .github/workflows/test.yml | 4 +++- README.rst | 4 ++-- changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md | 3 +++ tutorxqueue/plugin.py | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 4791ee0..e5dd7fd 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -2,7 +2,7 @@ name: Sync with private repo on: push: - branches: [ master, main, nightly ] + branches: [ release, main ] jobs: sync: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 23a429f..398a0ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,9 @@ name: Run tests on: pull_request: - branches: [master] + branches: [ release, main ] + push: + branches: [ release, main ] jobs: tests: diff --git a/README.rst b/README.rst index 20107a0..a787bfc 100644 --- a/README.rst +++ b/README.rst @@ -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 @@ -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) `_. +This work is licensed under the terms of the `GNU Affero General Public License (AGPL) `_. Troubleshooting --------------- diff --git a/changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md new file mode 100644 index 0000000..fb6e264 --- /dev/null +++ b/changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md @@ -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. \ No newline at end of file diff --git a/tutorxqueue/plugin.py b/tutorxqueue/plugin.py index a237460..dbecd10 100644 --- a/tutorxqueue/plugin.py +++ b/tutorxqueue/plugin.py @@ -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__