Merge branch 'release'
This commit is contained in:
commit
eb47275595
2
.github/workflows/sync.yml
vendored
2
.github/workflows/sync.yml
vendored
@ -2,7 +2,7 @@ name: Sync with private repo
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master, main, nightly ]
|
||||
branches: [ release, main ]
|
||||
|
||||
jobs:
|
||||
sync:
|
||||
|
||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@ -2,7 +2,9 @@ name: Run tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [master]
|
||||
branches: [ release, main ]
|
||||
push:
|
||||
branches: [ release, main ]
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
|
||||
@ -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) <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
|
||||
---------------
|
||||
|
||||
@ -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.
|
||||
@ -15,7 +15,7 @@ from tutor.__about__ import __version_suffix__
|
||||
|
||||
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__
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user