This repository has been archived by the owner on Nov 4, 2024. It is now read-only.
feat: splitting master and 2u/main branches #226
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nedbat
reviewed
Dec 6, 2023
.github/PULL_REQUEST_TEMPLATE.md
Outdated
| @@ -6,6 +10,8 @@ Although we have stopped integrating new contributions, we always appreciate sec | |||
|
|
|||
| ## Anyone internally merging to this repository is expected to [release and monitor their changes](https://openedx.atlassian.net/wiki/spaces/RS/pages/1835106870/How+to+contribute+to+our+repositories); if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released. | |||
There was a problem hiding this comment.
"Internally" is an ambiguous word here. I'm not sure if it pre-dated your work.
There was a problem hiding this comment.
updating in next commit. please hold...
nedbat
reviewed
Dec 6, 2023
README.rst
Outdated
| @@ -68,9 +68,11 @@ The code in this repository is licensed under the AGPL unless otherwise noted. P | |||
| How To Contribute | |||
| ----------------- | |||
|
|
|||
| Anyone merging to this repository is expected to `release and monitor their changes <https://openedx.atlassian.net/wiki/spaces/RS/pages/1835106870/How+to+contribute+to+our+repositories>`__; if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released. | |||
| Notice: Internal 2U contributions should be made against the ``2u/main`` branch. Open source contributions should continue to be made against the ``master`` branch. | |||
nedbat
reviewed
Dec 6, 2023
| Context | ||
| ------- | ||
|
|
||
| Both 2U and the Open edX community use ecommerce-worker's master branch for releases. Occasionally, changes |
There was a problem hiding this comment.
I thought I had suggested a change in the ecommerce ADR to put this sentence in the past tense, to make the new current state clearer. But I see it's the same in the ecommerce repo.
There was a problem hiding this comment.
yikes i might have missed that. i have to make a PR to ecommerce as part of this work, so i can update the ADR there too
nedbat
approved these changes
Dec 6, 2023
julianajlk
approved these changes
Dec 6, 2023
.github/PULL_REQUEST_TEMPLATE.md
Outdated
|
|
||
| ## If you're merging to 2u/main branch... | ||
|
|
||
| You are expected to `release and monitor your changes <https://2u-internal.atlassian.net/wiki/spaces/RS/pages/7963261/How+to+contribute+to+our+repositories>`__ (2U-private link); if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released. |
There was a problem hiding this comment.
This is supposed to be formatted as code and not a link?
There was a problem hiding this comment.
fixed! i was using rst markup
christopappas
added a commit
that referenced
this pull request
Dec 6, 2023
* feat: splitting master and 2u/main branches (#226) * docs: update PR template * docs: add ADR * feat: remove pypi publish workflow for 2u/main * feat: update 2u/main branch readme docs
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
⛔️ DEPRECATION WARNING
This repository is deprecated and in maintainence-only operation while we work on a replacement, please see this announcement for more information.
Although we have stopped integrating new contributions, we always appreciate security disclosures and patches sent to [email protected]
Anyone internally merging to this repository is expected to release and monitor their changes; if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released.
Merge checklist:
requirements/*.txtfiles)base.inif needed in productiontest.infor test requirementsmake upgrade && make requirementshave been run to regenerate requirementsPost merge:
(so basically once your build finishes, after maybe a minute you should see the new version in PyPi automatically (on refresh))
make upgradein ecommerce will look for the latest version in PyPi.ecommerceecomworkeron GoCD.released via GoCD.