renovate icon indicating copy to clipboard operation
renovate copied to clipboard

feat: gitlab-ci ref add logic for updating non top level `include`s

Open fredrondina opened this issue 2 years ago • 11 comments

Changes

Context

Current gitlab-ci ref bump logic only accounts for include sections that are at the top level of the .gitlab-ci.yml. This does not allows for the pipeline ref's contained within any subsection (such as within another job) of the .yml file to be updated. This pattern is commonly seen in .gitlab-cy.yml files used to configure parent child pipelines.

Closes #16833 Closes #9610

Documentation (please check one with an [x])

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

How I've tested my work (please tick 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
  • [X] Both unit tests + ran on a real repository

fredrondina avatar Jul 27 '22 18:07 fredrondina

CLA assistant check
All committers have signed the CLA.

CLAassistant avatar Jul 27 '22 18:07 CLAassistant

This is awesome. We really need this Gitlab CI ref support before we can use renovate in our enterprise

a1flecke avatar Jul 27 '22 19:07 a1flecke

This would be awesome to be able to support Gitlab refs at all levels.

rmacconn avatar Jul 28 '22 13:07 rmacconn

image

There seems to be a bug with the CLA status check, I have signed it and attached a screenshot showing this.

fredrondina avatar Jul 28 '22 13:07 fredrondina

@astellingwerf @fredrondina any updates on when this will land?

a1flecke avatar Jul 29 '22 17:07 a1flecke

@viceice, @astellingwerf, @secustor, @fredrondina Looks like this is coming along nicely. Do you think this will land this week?

a1flecke avatar Aug 03 '22 20:08 a1flecke

we should probably merge both managers before this PR as planned for future

Hey @viceice. Would it be possible to get this in first? My company is transitioning to Gitlab CI and wants to adopt renovate and move away from dependabot since dependabot does not support gitlab includes. We are using a lot of gitlab triggers that include refs. Renovate does not currently bump those refs since they are not top level. This is stopping us from launching renovate.

a1flecke avatar Aug 04 '22 12:08 a1flecke

we should probably merge both managers before this PR as planned for future

Hey @viceice. Would it be possible to get this in first? My company is transitioning to Gitlab CI and wants to adopt renovate and move away from dependabot since dependabot does not support gitlab includes. We are using a lot of gitlab triggers that include refs. Renovate does not currently bump those refs since they are not top level. This is stopping us from launching renovate.

you need at least fix all requested changes

viceice avatar Aug 04 '22 14:08 viceice

Requested changes have been made, ready for re-review

fredrondina avatar Aug 04 '22 16:08 fredrondina

Any updates on this?

a1flecke avatar Aug 08 '22 19:08 a1flecke

@viceice, @secustor , @astellingwerf , @rarkins , @fredrondina is this close? If not then we will need to launch Renovate with gitlab ci support turned off.

a1flecke avatar Aug 09 '22 12:08 a1flecke

I am still having issues with the CLA check, I think it is due to some of my commits not being verified. What is the best step for me to take to get this last check passing?

fredrondina avatar Aug 10 '22 20:08 fredrondina

probably squash or rebase your commits and fix author.

viceice avatar Aug 10 '22 20:08 viceice

probably squash or rebase your commits and fix author.

This will require a force push after the squash, which the contribution guidelines advise against.

Is this ok to do? (squash / rebase)

fredrondina avatar Aug 10 '22 20:08 fredrondina

it's ok to fix git author

viceice avatar Aug 10 '22 20:08 viceice

squashed and rebased in order to fix commit verification

fredrondina avatar Aug 11 '22 14:08 fredrondina

Any idea when this will be merged?

fredrondina avatar Aug 15 '22 12:08 fredrondina

That won't be until at least after the conflicts are resolved.

astellingwerf avatar Aug 15 '22 13:08 astellingwerf

That won't be until at least after the conflicts are resolved.

Ok, can I rebase to fix the conflict, and then force push back to my branch?

fredrondina avatar Aug 15 '22 20:08 fredrondina

no, please do merge commit with the fix

viceice avatar Aug 15 '22 20:08 viceice

Merge conflicts resolved, ready for re-review

fredrondina avatar Aug 16 '22 13:08 fredrondina

:tada: This PR is included in version 32.161.0 :tada:

The release is available on:

Your semantic-release bot :package::rocket:

renovate-release avatar Aug 16 '22 16:08 renovate-release