Skip to content
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.

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

Testing Taweret workflow #104

Merged
merged 10 commits into from
Jul 23, 2024
Merged

Testing Taweret workflow #104

merged 10 commits into from
Jul 23, 2024

Conversation

asemposki
Copy link
Collaborator

Here we're looking at how the Taweret workflow might look if we have pushes into develop that pass there but then do not pass tomain, if main has some other commits that haven't been merged back into develop. This requires us to choose to resolve these conflicts by hand.

jared321 and others added 9 commits July 19, 2024 09:49
Made additions to .rst and python docstring docs to see that they are rendered
locally by tox, that they are visible in the RTD test rendering for the PR, but
not published in the official, public RTD docs.  They did show up as expected
with tox.

NOTE:  I want these to make it into main so that we do see them automatically
incluced in the official, public RTD docs.  We can then remove them as a hotfix
to test the whole workflow.  Note that these were also added in to generate a
merge conflict with the changes made direclty on main at commit d53cbfe so that
we can test the git workflow a bit as well.
Some were running on edits to PR conversations as well as upon closing.  Revert
to default, which seems to be working for other PR actions.  If we want actions
to run upon merging, then we will make actions on special branches in accord
with the git workflow to run on pushes to the branch.
Finalize publishing sphinx docs to RTD
@asemposki
Copy link
Collaborator Author

Did the resolution by hand as discussed. Tests running currently.

Copy link

codecov bot commented Jul 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.85%. Comparing base (a62b10f) to head (00f7eeb).
Report is 144 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #104   +/-   ##
=======================================
  Coverage   66.85%   66.85%           
=======================================
  Files          14       14           
  Lines        1554     1554           
=======================================
  Hits         1039     1039           
  Misses        515      515           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@asemposki asemposki merged commit cb85814 into main Jul 23, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants