diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 5d074b3..419a967 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 05cf0be..5e42086 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 0f087ad..a592724 100644 --- a/README.rst +++ b/README.rst @@ -58,4 +58,4 @@ This Tutor plugin is maintained by Muhammad Faraz Maqsood from `Edly `_. +This work is licensed under the terms of the `GNU Affero General Public License (AGPL) `_. diff --git a/changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md new file mode 100644 index 0000000..0385bc2 --- /dev/null +++ b/changelog.d/20241119_170533_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. diff --git a/tutorminio/plugin.py b/tutorminio/plugin.py index 6225ea5..9ac07d3 100644 --- a/tutorminio/plugin.py +++ b/tutorminio/plugin.py @@ -10,7 +10,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__