Skip to content

Dev guide updates #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forsyth2 merged 1 commit into from
Nov 14, 2023
Merged

Dev guide updates #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/dev_guide/release.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Bumping the Version
:: Looking good? (y/N)
>

3. If you encounter ``Error: Command `git push upstream main` failed``, as in `issue 470 <https://github.com/E3SM-Project/zppy/issues/470>`_, you can run ``git push upstream main`` yourself.
3. If you encounter ``Error: Command `git push upstream main` failed``, as in `issue 470 <https://github.com/E3SM-Project/zppy/issues/470>`_, you can run ``git push upstream <branch>`` yourself.

4. Create a pull request to the main repo and merge it. Mark yourself as the assignee, and mark "Update version" as the label.

Expand Down
5 changes: 4 additions & 1 deletion docs/source/dev_guide/release_testing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,10 @@ Testing directions for making a release
* If there are only expected failures, then update the expected files. Use the "Commands to run to replace outdated expected files" from the links on step 8. Then repeat step 9.
* If there are no failures at all, proceed to the next step.

11. Make a pull request and merge any changes. This keeps the repo updated with the latest testing configurations. Mark yourself as the assignee, and mark "Testing" as the label. If you made bug fixes, add the "semver: bug" label.
11. Run ``git diff``. All of your changes should be from editing ``tests/integration/utils.py`` in step 5, and running it in step 8.

* If this is the case, you can delete this testing branch.
* If not, you have probably made code changes to get the tests to pass. Make a pull request to merge the changes. Add the "semver: bug" label.

12. Wrap up release testing:

Expand Down