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

Update CI/CD workflows for updating dependencies #351

Merged
merged 6 commits into from
Oct 10, 2023

Conversation

CasperWA
Copy link
Contributor

@CasperWA CasperWA commented Oct 3, 2023

Description:

Closes #349

Dependabot

Repeat the jobs with 'release/pydantic-v1-support' as the target branch.

CI - Check dependencies

Add a user input when manually running the workflow to determine the target branch to check pyproject.toml dependencies in as well as open a PR against.

Add a new job to also run the callable SINTEF/ci-cd workflow against the 'release/pydantic-v1-support' branch.
Change the use of the workflow_dispatch input 'target_branch' so that it's checked against the triggering event being 'schedule'.

Essentially, now:

  • When triggered by 'schedule', both jobs should run, creating 2 PRs, one against 'ci/dependabot-updates' & one against
    'release/pydantic-v1-support'.
  • When manually triggered, only one of the jobs should run, creating either a PR against 'ci/dependabot-updates' OR against 'release/pydantic-v1-support'.

Both jobs should always still only run for the original repository, i.e., not for forks - this is unchanged from previous iterations.

Future

Changes are already in the works for the ignore rules in CI - Check dependencies when migrating to pydantic v2 (see #330), the split into two CI jobs here will accommodate this difference as well.
This means, depending on the merge order, either this PR or #330 should be updated accordingly.

Type of change:

  • Bug fix.
  • New feature.
  • Documentation update.

Checklist for the reviewer:

This checklist should be used as a help for the reviewer.

  • Is the change limited to one issue?
  • Does this PR close the issue?
  • Is the code easy to read and understand?
  • Do all new feature have an accompanying new test?
  • Has the documentation been updated as necessary?

Dependabot:
- Repeat the jobs with 'release/pydantic-v1-support' as the target
branch.

CI - Check dependencies:
- Add a user input when manually running the workflow to determine the
target branch to check pyproject.toml dependencies in as well as open a
PR against.
Add a new job to also run the callable SINTEF/ci-cd workflow against the
'release/pydantic-v1-support' branch.
Change the use of the `workflow_dispatch` input 'target_branch' so that
it's checked against the triggering event being 'schedule'.

Essentially, now:
- When triggered by 'schedule', both jobs should run, creating 2 PRs, one
against 'ci/dependabot-updates' & one against
'release/pydantic-v1-support'.
- When manually triggered, only one of the jobs should run, creating
either a PR against 'ci/dependabot-updates' OR against
'release/pydantic-v1-support'.

Both jobs should always still only run for the original repository,
i.e., not for forks - this is unchanged from previous iterations.
@codecov-commenter
Copy link

codecov-commenter commented Oct 3, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (6688cd9) 82.16% compared to head (f674fde) 82.08%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #351      +/-   ##
==========================================
- Coverage   82.16%   82.08%   -0.09%     
==========================================
  Files          44       44              
  Lines        1211     1211              
==========================================
- Hits          995      994       -1     
- Misses        216      217       +1     
Flag Coverage Δ
linux 82.08% <ø> (ø)
linux-strategies 84.75% <ø> (ø)
windows ?
windows-strategies ?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

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

@CasperWA CasperWA mentioned this pull request Oct 3, 2023
8 tasks
@CasperWA CasperWA requested review from Treesarj and daniel-sintef and removed request for Treesarj October 4, 2023 08:14
Copy link
Contributor

@daniel-sintef daniel-sintef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved but address these comments. Also add a reference to the relevant section(s) to the CI/CD docs

Also, fix ignore rules by:
- Using `=` instead `==` to denote 'version' values.
- Only add ignore rules for dependencies with an explicit upper limit.
Copy link
Contributor

@daniel-sintef daniel-sintef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments are already good enough. I've added some suggested changes use/ignore them to your preference

Co-authored-by: Daniel Marchand <Daniel.Marchand@sintef.no>
@CasperWA CasperWA enabled auto-merge (squash) October 10, 2023 06:37
@CasperWA CasperWA merged commit fe36a23 into master Oct 10, 2023
9 checks passed
@CasperWA CasperWA deleted the cwa/close-349-dependency-automation-for-split branch October 10, 2023 06:39
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.

Update dependency automation to include pydantic v1 support branch
3 participants