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.

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

Jump to bottom

main_v5.1 - Enhance update truth data workflow to create a uniquely named branch... #2678

Merged
merged 4 commits into from
Sep 6, 2024
Merged

main_v5.1 - Enhance update truth data workflow to create a uniquely named branch... #2678

merged 4 commits into from
Sep 6, 2024

Conversation

georgemccabe
Copy link
Collaborator

@georgemccabe georgemccabe commented Sep 5, 2024 •
edited
Loading

…to update *-ref branches and commit/append to a log file that tracks the reasons for updating the truth data. This is done to ensure that the *-ref branch testing workflow run that actually updates the truth data is always run even if there are no other changes to the METplus branch since the last update, e.g. when a change to another component like MET warrants the truth data update

Pull Request Testing

  • Describe testing already performed for these changes:

N/A

  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

Need to merge changes and test that GHA workflow runs as expected to update the truth data for main_v5.1 branch for #2673

  • Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [Yes]

  • Do these changes include sufficient testing updates? [Yes]

  • Will this PR result in changes to the test suite? [No]

    If yes, describe the new output and/or changes to the existing output:

  • Do these changes introduce new SonarQube findings? [No]

    If yes, please describe:

  • Please complete this pull request review by 9/9/2024.

Pull Request Checklist

See the METplus Workflow for details.

  • Add any new Python packages to the METplus Components Python Requirements table.
  • For any new datasets, an entry to the METplus Verification Datasets Guide.
  • Review the source issue metadata (required labels, projects, and milestone).
  • Complete the PR definition above.
  • Ensure the PR title matches the feature or bugfix branch name.
  • Define the PR metadata, as permissions allow.
    Select: Reviewer(s) and Development issue
    Select: Milestone as the version that will include these changes
    Select: Coordinated METplus-X.Y Support project for bugfix releases or METplus-Wrappers-X.Y.Z Development project for official releases
  • After submitting the PR, select the ⚙️ icon in the Development section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected. - no issue
  • After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
  • Close the linked issue and delete your feature or bugfix branch from GitHub.

@georgemccabe
Enhance update truth data workflow to create a uniquely named branch …
adf92c5 
…to update *-ref branches and commit/append to a log file that tracks the reasons for updating the truth data. This is done to ensure that the *-ref branch testing workflow run that actually updates the truth data is always run even if there are no other changes to the METplus branch since the last update, e.g. when a change to another component like MET warrants the truth data update
@georgemccabe
git add change log file in case it doesn't already exist
0332032
@georgemccabe
changed logic to no longer push changes to develop/main_vX.Y, but ins…
5bbb590 
…tead merge changes from -ref into the update branch
@georgemccabe
retain update truth history file from *-ref
cd07c02
@jprestop
Copy link
Collaborator

jprestop commented Sep 5, 2024

@georgemccabe The tests are still running, but I see that 4 have failed so far. Is this expected? Should I still approve and merge and then try rerunning the workflow?

@georgemccabe
Copy link
Collaborator Author

@jprestop, I believe those failures are due to bugfix changes to MET that have not been updated due to the need for this PR! As long as there are no errors and only diffs, you can proceed. Thanks for checking.

@jprestop
Copy link
Collaborator

jprestop commented Sep 6, 2024

@georgemccabe, thank you for the guidance. I checked and verified that there are no errors and only diffs, so I will proceed as you suggested.

@jprestop jprestop merged commit 3769e0f into main_v5.1 Sep 6, 2024
66 of 72 checks passed
@jprestop jprestop deleted the feature_main_v5.1_fix_update_truth branch September 9, 2024 16:48
@jprestop jprestop mentioned this pull request Sep 9, 2024
Closed
11 tasks
jprestop added a commit that referenced this pull request Sep 9, 2024
@github-actions @georgemccabe
@JohnHalleyGotway @dependabot @jprestop @metplus-bot
Update main_v5.1-ref after dtcenter/MET#2960 (#2683)
5efcdc2 
* added new use case that was missing

* Bugfix #2279 main_v5.1 - buoy station file from 2022 (#2281)

* Fix typo in pull_request_template.md

* added notes to make it clear that upgrade instructions are not needed if upgrading from 5.0 to 5.1

* New issue template: Update Truth (#2332)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
(cherry picked from commit 44335f3)

* add GitHub Actions workflow that is used to create Docker images that hold the conda environment used for the automated tests -- adding this to the default main_v5.1 branch so that it will become available to run for other branches as a workflow_dispatch workflow

* add argument to workflow dispatch event so that MET DockerHub repo used for tests can be easily overridden to test changes in a MET PR before merging

* Feature dtcenter/MET#2796 main_v5.1 GHA Node20 deprecation warnings (#2474)

* per dtcenter/MET#2796, update versions of actions to prevent deprecated node warnings in GHA runs - main_v5.1

* fix ReadTheDocs requirements to include pillow which is a dependency of sphinx-gallery: see https://blog.readthedocs.com/defaulting-latest-build-tools/ for more info on why this was necessary

* install python packages via apk instead of pip to prevent GHA failures that were fixed in develop but not in main_v5.1

* per dtcenter/MET#2796, fix error log merging for main_v5.1 same as develop

* Bump pillow from 10.0.1 to 10.2.0 in /docs (#2477)

Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@10.0.1...10.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Create 5.1.0_casper

* Update update_truth.md

Fix typo in the update_truth issue template.

* Update update_truth.md

Clarify wording on the update_truth issue template.

* Feature #2537 main_v5.1 sonarqube_gha (#2542)

* Per #2537, add SonarQube workflow for METplus

* Per #2537, update nightly build email list.

* Per #2537, fix cut/paste error configure_sonarqube.sh

* Per #2537, exclude test code from code coverage statistics.

* update link to METplus Components Python Requirements table in PR template

* update pillow version based on recommendation from dependabot: https://github.com/dtcenter/METplus/security/dependabot/5

* Fix main_v5.1 GHA - disk space and METviewer version (#2561)

* added more commands to free up disk space as suggested in https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh, ci-run-all-cases

* update location of METviewer docker-compose.yml file that moved from PR dtcenter/METviewer#525

* turn on use cases to test

* use main_v5.1 tag of METviewer on DockerHub

* turn off use case groups after confirming that they now run successfully

* Feature #2537 main_v5.1 single_sq_project (#2559)

* Feature 2346 main v5.1 update templates (#2588)

* Per #2346, modifying issue templates

* Per #2346, modifying the pull request template

* Per #2346, modifying entries based on suggestions by @georgemccabe

* Feature 2346 main v5.1 update templates (#2595)

* Per #2346, modifying issue templates

* Per #2346, modifying the pull request template

* Per #2346, modifying entries based on suggestions by @georgemccabe

* Per 2346, making updates based on feedback at last MET Eng. Meeting

* fix broken link

* Bump certifi from 2023.7.22 to 2024.7.4 (#2632)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.7.22 to 2024.7.4.
- [Commits](certifi/python-certifi@2023.07.22...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* main_v5.1 - Enhance update truth data workflow to create a uniquely named branch... (#2678)

* Enhance update truth data workflow to create a uniquely named branch to update *-ref branches and commit/append to a log file that tracks the reasons for updating the truth data. This is done to ensure that the *-ref branch testing workflow run that actually updates the truth data is always run even if there are no other changes to the METplus branch since the last update, e.g. when a change to another component like MET warrants the truth data update

* git add change log file in case it doesn't already exist

* changed logic to no longer push changes to develop/main_vX.Y, but instead merge changes from -ref into the update branch

* retain update truth history file from *-ref

* prevent failure when changelog does not exist in -ref branch

* added entry to update truth change log: main_v5.1 dtcenter/MET#2960

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jprestop jprestop Awaiting requested review from jprestop

Assignees
No one assigned
Labels
None yet
Projects
Coordinated METplus-5.1 Support
Status: 🏁 Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@georgemccabe @jprestop