From 519062a168f7e261cbbfb54cacc0144780a76c1b Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Tue, 19 Nov 2024 18:01:36 +0500 Subject: [PATCH] feat!: Rename branches master->release, nightly->main --- .github/workflows/sync.yml | 2 +- .github/workflows/test.yml | 4 +++- README.rst | 2 +- changelog.d/20241119_175930_dawoud.sheraz_branch_rename.md | 3 +++ tutorandroid/plugin.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelog.d/20241119_175930_dawoud.sheraz_branch_rename.md diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index ed5ceb5..4529f7f 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 cb4b940..1c8501f 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 a27c8ae..3c4f7ae 100644 --- a/README.rst +++ b/README.rst @@ -71,4 +71,4 @@ This Tutor plugin is maintained by Muhammad Ali from `Edly `__. License ------- -This software is licensed under the terms of the AGPLv3. +This work is licensed under the terms of the `GNU Affero General Public License (AGPL) `_. diff --git a/changelog.d/20241119_175930_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_175930_dawoud.sheraz_branch_rename.md new file mode 100644 index 0000000..0385bc2 --- /dev/null +++ b/changelog.d/20241119_175930_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/tutorandroid/plugin.py b/tutorandroid/plugin.py index 255e079..a0a2b6c 100644 --- a/tutorandroid/plugin.py +++ b/tutorandroid/plugin.py @@ -11,7 +11,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__