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: renovate handle regexManagers to update conftest/tf versions #2807

Merged
merged 6 commits into from
Dec 19, 2022
Merged

feat: renovate handle regexManagers to update conftest/tf versions #2807

merged 6 commits into from
Dec 19, 2022

Conversation

krrrr38
Copy link
Contributor

@krrrr38 krrrr38 commented Dec 17, 2022 •
edited
Loading

NOTE: this PR base branch is #2681

what

why

conftest/tf versions update automation. less manual operation.

discussions

  • I don't handle dependabot / renovate conflicts.
  • renovate.json vs renovate.json5
    • json5 is good. we can write comments on json5.

references

image

krrrr38
krrrr38 commented Dec 17, 2022
View reviewed changes
renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated
// match `ENV *_VERSION=x.x.x` with renovate configurations
"renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sENV .*?_VERSION=(?<currentValue>.*)\\s",
],
versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Currently this setting find following comment.

# renovate: datasource=github-releases depName=open-policy-agent/conftest versioning=semver
ENV DEFAULT_CONFTEST_VERSION=0.35.0

In this case, we use GitHub releases on open-policy-agent/conftest, which means https://github.com/open-policy-agent/conftest/releases.

see also supported datasource

@krrrr38 krrrr38 marked this pull request as ready for review December 17, 2022 05:37
@krrrr38 krrrr38 requested a review from a team as a code owner December 17, 2022 05:37
@krrrr38 krrrr38 marked this pull request as draft December 17, 2022 05:51
@krrrr38 krrrr38 force-pushed the feat-renovate-configure-regex branch from c4734c7 to 2366387 Compare December 17, 2022 06:10
@krrrr38 krrrr38 marked this pull request as ready for review December 17, 2022 06:11
nitrocode
nitrocode reviewed Dec 17, 2022
View reviewed changes
testdrive/utils.go
@@ -34,7 +34,7 @@ import (
)

const hashicorpReleasesURL = "https://releases.hashicorp.com"
const terraformVersion = "1.3.5"
const terraformVersion = "1.3.6" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
Copy link
Member

Choose a reason for hiding this comment

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

Did you mean to change 1.3.5 to 1.3.6? It's not changed in the other places.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, runatlantis:renovate/configure branch contains 1.3.5, and main branch contains 1.3.6.

So could you update #2681?

Copy link
Member

Choose a reason for hiding this comment

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

Not sure what I'm updating in that pr ? Once this PR is merged, it will close #2681

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#2681 PR is renovate introduce confirmation PR.

So it is better to do followings.

  1. merge this feat: renovate handle regexManagers to update conftest/tf versions #2807 into Configure Renovate - abandoned #2681
  2. confirm renovate config is all valid on Configure Renovate - abandoned #2681 PR description which will be updated by renovate
  3. merge Configure Renovate - abandoned #2681 into main

Copy link
Contributor Author

Choose a reason for hiding this comment

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

or not need it, I will change this PR base branch to main.

This was referenced Dec 17, 2022
Merged
Merged
@krrrr38 krrrr38 force-pushed the feat-renovate-configure-regex branch 2 times, most recently from a62ab32 to b328e30 Compare December 18, 2022 08:26
@krrrr38 krrrr38 requested a review from nitrocode December 18, 2022 10:32
@nitrocode
Copy link
Member

When you get a chance, please correct conflicts and merge from the latest branch.

@krrrr38 krrrr38 force-pushed the feat-renovate-configure-regex branch from b328e30 to 8b3fd5b Compare December 18, 2022 22:01
@krrrr38 krrrr38 force-pushed the feat-renovate-configure-regex branch from 8b3fd5b to 6bf9242 Compare December 18, 2022 22:03
@krrrr38
Copy link
Contributor Author

krrrr38 commented Dec 18, 2022

@nitrocode
I fixed the conflicts. When you have a time, please review and merge into renovate/configure branch. After merge this PR, you can see renovate summary on the #2681 PR description which will be update soon by renovate.

nitrocode
nitrocode approved these changes Dec 18, 2022
View reviewed changes
Copy link
Member

@nitrocode nitrocode left a comment

Choose a reason for hiding this comment

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

@runatlantis/maintainers please review dropping dependabot for renovatebot

krrrr38
krrrr38 commented Dec 18, 2022
View reviewed changes
.github/renovate.json5 Outdated Show resolved Hide resolved
nitrocode
nitrocode reviewed Dec 18, 2022
View reviewed changes
.github/renovate.json5 Outdated Show resolved Hide resolved
krrrr38
krrrr38 commented Dec 18, 2022
View reviewed changes
.github/renovate.json5 Outdated Show resolved Hide resolved
@nitrocode nitrocode changed the base branch from renovate/configure to main December 19, 2022 00:20
@nitrocode nitrocode merged commit bbc7b99 into runatlantis:main Dec 19, 2022
@nitrocode
Copy link
Member

Thank you again @krrrr38 ! Great work!!!

@nitrocode nitrocode added this to the 0.22.0 milestone Dec 23, 2022
@albertorm95 albertorm95 mentioned this pull request May 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitrocode nitrocode nitrocode approved these changes

@jamengual jamengual jamengual approved these changes

@chenrui333 chenrui333 chenrui333 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v0.22.0
Development

Successfully merging this pull request may close these issues.

Prevent manual PRs to update TF and CONFTEST versions
4 participants
@krrrr38 @nitrocode @chenrui333 @jamengual