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(circleci): parsing of inline orb definitions #31843

Merged
merged 1 commit into from
Dec 14, 2024

Conversation

steved
Copy link
Contributor

@steved steved commented Oct 7, 2024

Changes

#30142 changed how CircleCI config parsing worked, but didn't take into account inline orb definitions.

Context

The config5.yml fixture is a valid CircleCI config:

$ circleci config validate lib/modules/manager/circleci/__fixtures__/config5.yml
Config file at lib/modules/manager/circleci/__fixtures__/config5.yml is valid.

However, we lost the ability to parse out inline orb definitions which can include orb references and images.

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@steved
Copy link
Contributor Author

steved commented Oct 7, 2024

cc @secustor @viceice

lib/modules/manager/circleci/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/circleci/__fixtures__/config5.yml Outdated Show resolved Hide resolved
lib/modules/manager/circleci/extract.spec.ts Outdated Show resolved Hide resolved
@steved steved requested a review from viceice October 9, 2024 06:09
@steved
Copy link
Contributor Author

steved commented Oct 16, 2024

bump @viceice @RahulGautamSingh @zharinov

@steved steved force-pushed the steved/circleci-orb-orbs branch from d8f2826 to d4a3c40 Compare October 22, 2024 05:05
rarkins
rarkins previously approved these changes Oct 22, 2024
@rarkins rarkins requested a review from secustor October 22, 2024 05:27
@rarkins
Copy link
Collaborator

rarkins commented Oct 24, 2024

No need to merge from main if no changes have been made

lib/modules/manager/circleci/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/circleci/extract.ts Outdated Show resolved Hide resolved
Copy link
Collaborator

@secustor secustor left a comment

Choose a reason for hiding this comment

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

Don't really like the zod hack, but it if it is not otherwise solveable...

secustor
secustor previously approved these changes Oct 25, 2024
rarkins
rarkins previously approved these changes Oct 26, 2024
@rarkins rarkins requested a review from viceice October 26, 2024 08:14
@rarkins rarkins enabled auto-merge October 26, 2024 08:14
@steved
Copy link
Contributor Author

steved commented Nov 4, 2024

@viceice mind re-reviewing? thanks!

lib/modules/manager/circleci/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/circleci/schema.ts Outdated Show resolved Hide resolved
lib/modules/manager/circleci/schema.ts Outdated Show resolved Hide resolved
lib/modules/manager/circleci/schema.ts Outdated Show resolved Hide resolved
lib/modules/manager/circleci/schema.ts Outdated Show resolved Hide resolved
auto-merge was automatically disabled November 5, 2024 20:42

Head branch was pushed to by a user without write access

@steved steved dismissed stale reviews from rarkins and secustor via 1d97ea6 November 5, 2024 20:42
rarkins
rarkins previously approved these changes Nov 21, 2024
@rarkins rarkins enabled auto-merge November 21, 2024 06:27
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

still not happy with types

@steved steved force-pushed the steved/circleci-orb-orbs branch from 9959872 to d92a865 Compare December 13, 2024 00:52
@rarkins rarkins added this pull request to the merge queue Dec 14, 2024
Merged via the queue into renovatebot:main with commit ffa4333 Dec 14, 2024
39 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 39.69.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@steved steved deleted the steved/circleci-orb-orbs branch December 16, 2024 05:40
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.

6 participants