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

fix(ci): revise distribution scripts and workflow #1103

Merged
merged 5 commits into from
Dec 8, 2022

Conversation

wpbonelli
Copy link
Contributor

@wpbonelli wpbonelli commented Dec 6, 2022

  • Only trigger job to open PR reinitializing develop after release is published. The automated workflow only creates a draft release — the release must be published manually after inspection. Previously the reinitialization job was triggered immediately after the release branch was merged to master, after this reinit will only happen after the release post is converted from draft to official.

  • Update develop reinitialization job such that, for minor version releases, minor version number is incremented from just-released version and patch number is reset to 0, while for patch releases, the version on develop does not change. This is according to the tentative expectation that minor version releases will branch from develop, while patch releases will branch from master to exclude broader changesets in progress on develop. The forthcoming 6.4.1 release is an exception to the above: develop will be bumped to 6.5.0 after 6.4.1 but will then stay there for all subsequent 6.4.X patches until 6.5.0 is released.

  • Run test suite after building binaries (tests should all pass before a release branch is created, but a final check is probably not a bad idea)

  • Fix test_z01_testmodels_mf6.py to skip dev testmodels/examples on v6* branches, since this is how release branches must be named to trigger the release.yml workflow (previously only skipped on branches named master and release)

  • Add developmode test marker to skip tests requiring IDEVELOPMODE = 1 in the release workflow

  • Fix update_version.py minor/patch version increment flags

  • Only build examples in build_dist.py for full release

@wpbonelli wpbonelli force-pushed the revise-dist-scripts branch from 6e9da19 to f990bf7 Compare December 8, 2022 16:56
@wpbonelli wpbonelli force-pushed the revise-dist-scripts branch from f990bf7 to 14828b0 Compare December 8, 2022 19:58
@wpbonelli wpbonelli marked this pull request as ready for review December 8, 2022 22:23
@wpbonelli wpbonelli merged commit 8c9388d into MODFLOW-USGS:develop Dec 8, 2022
@wpbonelli wpbonelli deleted the revise-dist-scripts branch December 8, 2022 22:35
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.

2 participants