Skip to content

Commit

Permalink
Dev Guide Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
forsyth2 committed Nov 14, 2023
1 parent fa52370 commit 4af2fe0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/source/dev_guide/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Bumping the Version
:: Looking good? (y/N)
>

3. If you encounter ``Error: Command `git push upstream main` failed``, as in `zppy 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 `zppy 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
2 changes: 1 addition & 1 deletion docs/source/dev_guide/release_testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Testing directions for making a release

* If there are no failures, proceed to the next step.

7. 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. (If you've made no changes, skip this step).
7. Run ``git diff``. You should not have any changes. If you do, 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.

8. Wrap up release testing:

Expand Down

0 comments on commit 4af2fe0

Please sign in to comment.