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

feat(gitlab): support GitLab CI/CD component references #26660

Merged
merged 24 commits into from Jan 23, 2024
Merged

feat(gitlab): support GitLab CI/CD component references #26660

merged 24 commits into from Jan 23, 2024

Conversation

fgreinacher
Copy link
Contributor

@fgreinacher fgreinacher commented Jan 16, 2024 •
edited

Changes

This PR adds support for bumping references to GitLab CI/CD components.

Context

Resolves #23431

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:

⚒️ with ❤️ by @siemens

@fgreinacher fgreinacher marked this pull request as ready for review January 16, 2024 10:59
secustor
secustor requested changes Jan 16, 2024
View reviewed changes
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.

We would prefer if you could implement this in gitlabci as we plan to merge gitlabci-include into it eventually.

It should be reasonable possible to use a schema for this sub part.

lib/modules/manager/gitlabci-include/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/gitlabci-include/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/gitlabci-include/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/gitlabci-include/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/gitlabci-include/extract.ts Outdated Show resolved Hide resolved
@fgreinacher
Copy link
Contributor Author

I tried to keep it very similar to the existing logic. Would it be OK to keep it here to get the feature out and afterwards I start a PR to merge the two managers (will take a bit I guess)?

@secustor
Copy link
Collaborator

Please move it now, else we will have to write migrations to move people over.

@fgreinacher fgreinacher mentioned this pull request Jan 18, 2024
Merged
6 tasks
secustor
secustor previously approved these changes Jan 18, 2024
View reviewed changes
@fgreinacher
Copy link
Contributor Author

I have rebased this. Ready for another round of 👀

viceice
viceice reviewed Jan 20, 2024
View reviewed changes
lib/modules/manager/gitlabci/common.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/gitlabci/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/gitlabci/extract.ts
{ err, packageFile },
'Error extracting GitLab CI dependencies',
);
if (err.stack?.startsWith('YAMLException:')) {
Copy link
Member

Choose a reason for hiding this comment

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

🤔 I don't really see a benefit for this conditional logging. only message is different

@rarkins WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not too ambitious about it. I have copied it from the existing code in the gitlabci-include manager.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This pattern is used in multiple places:

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But agreed, the different message does not bring much benefit, unless someone explicitly wants to match for it in their logging.

viceice
viceice reviewed Jan 20, 2024
View reviewed changes
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.

last change 🤗

lib/modules/manager/gitlabci/extract.ts Outdated Show resolved Hide resolved
@fgreinacher @viceice
Update extract.ts
ec13858 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@secustor secustor added this pull request to the merge queue Jan 23, 2024
Merged via the queue into renovatebot:main with commit 487d933 Jan 23, 2024
36 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.148.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@fgreinacher fgreinacher deleted the feat/cicd-components branch January 24, 2024 07:45
rvanbutselaar pushed a commit to rvanbutselaar/renovate that referenced this pull request Feb 2, 2024
@fgreinacher @viceice
feat(gitlab): support GitLab CI/CD component references (renovatebot#…
edea11d 
…26660)

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@viceice viceice viceice approved these changes

@secustor secustor secustor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support GitLab CI/CD components
4 participants
@fgreinacher @secustor @renovate-release @viceice