Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

feat: update 2u/main branch with new readme/docs and create first 2u/main version #228

Merged
merged 3 commits into from
Dec 6, 2023

Conversation

christopappas
Copy link
Contributor

⛔️ MAIN BRANCH WARNING! 2U EMPLOYEES must make branches against the 2u/main BRANCH

  • I have checked the branch to which I would like to merge.

⛔️ 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]

If you're merging to master (not 2u/main) branch...

Merge checklist:

  • Any new requirements are in the right place (do not manually modify the requirements/*.txt files)
    • base.in if needed in production
    • test.in for test requirements
    • make upgrade && make requirements have been run to regenerate requirements
  • Version bumped

Post merge:

  • Tag pushed and a new version released
    • Note: Assets will be added automatically. You just need to provide a tag (should match your version number) and title and description.
  • After versioned build finishes in GitHub CI, verify version has been pushed to PyPI
    • Each step in the release build has a condition flag that checks if the rest of the steps are done and if so will deploy to PyPi.
      (so basically once your build finishes, after maybe a minute you should see the new version in PyPi automatically (on refresh))
  • PR created in ecommerce to upgrade dependencies (including ecommerce-worker)
    • This must be done after the version is visible in PyPi as make upgrade in ecommerce will look for the latest version in PyPi.
    • Note: the ecommerce-worker constraint in ecommerce must also be bumped to the latest version in PyPi.
  • Deploy ecommerce
  • Deploy ecomworker

If you're merging to 2u/main branch...

You are expected to release and monitor your changes (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.

Merge checklist:

  • Any new requirements are in the right place (do not manually modify the requirements/*.txt files)
    • base.in if needed in production
    • test.in for test requirements
    • make upgrade && make requirements have been run to regenerate requirements
  • Version bumped

Post merge:

  • Tag pushed and a new version released
    • Warning: You must use 2u/main as the target release branch
    • Note: You should prefix the tag with "2u/" (for example, "2u/3.3.4")
    • Note: Assets will be added automatically. You just need to provide a tag (should match your version number) and title and description.
  • PR created in ecommerce against 2u/main branch to upgrade dependencies (including ecommerce-worker)
    • Note: the ecommerce-worker constraint in ecommerce must also be bumped to the tag version you just released.
  • Deploy ecommerce
  • Deploy ecomworker on GoCD.
    • While some functions in ecommerce-worker are run via ecommerce, others are handled by a standalone AMI and must be
      released via GoCD.

christopappas and others added 2 commits December 6, 2023 14:51
* feat: splitting master and 2u/main branches

* docs: update PR template

* docs: add ADR
@christopappas christopappas requested a review from a team as a code owner December 6, 2023 19:57
ecommerce_worker/__init__.py Outdated Show resolved Hide resolved
Copy link

@julianajlk julianajlk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was an example on the other PR on the pull request template to add the 2U prefix to the version number, can you modify that - if we're not supposed to add the prefix?

https://github.com/openedx/ecommerce-worker/blob/a1af7a158d5cb655b06747f9b2a7b3f4a55c85cb/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L46

@christopappas
Copy link
Contributor Author

There was an example on the other PR on the pull request template to add the 2U prefix to the version number, can you modify that - if we're not supposed to add the prefix?

https://github.com/openedx/ecommerce-worker/blob/a1af7a158d5cb655b06747f9b2a7b3f4a55c85cb/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L46

chatted, and confirmed the prefix is intended for the tag release, but just not the version that's present in __init__.py

@christopappas christopappas merged commit dd329c0 into 2u/main Dec 6, 2023
6 checks passed
@christopappas christopappas deleted the cpappas/2umain-functional-changes branch December 6, 2023 20:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants