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

Do not upgrade to golang 1.20 in 1.13 branch #23723

Merged
merged 3 commits into from Feb 14, 2023

Conversation

aanm
Copy link
Member

@aanm aanm commented Feb 13, 2023

No description provided.

Renovate supports JSON5 so we can start using comments in it.

Signed-off-by: André Martins <andre@cilium.io>
Cilium 1.13.0 will be released before golang 1.20.1 is made available,
thus we want to prevent renovate bot from creating PRs for golang 1.20
in the 1.13 branch.

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added the release-note/misc This PR makes changes that have no direct user impact. label Feb 13, 2023
@aanm aanm requested a review from a team as a code owner February 13, 2023 20:26
@aanm
Copy link
Member Author

aanm commented Feb 13, 2023

@gandro what was the other comment that you wanted to have in renovate's config?

@gandro
Copy link
Member

gandro commented Feb 14, 2023

@gandro what was the other comment that you wanted to have in renovate's config?

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index ef60be672022..76a2dc09108d 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -10,7 +10,12 @@
     "images/**",
     "examples/hubble/*"
   ],
+  // This ignorePaths configuration option overrides the config:base preset and
+  // should not be removed.
+  // If removed, we would fall back on the config:base preset, which ignores any
+  // paths that match 'examples/*' (which we explicitly do not want to ignore).
   "ignorePaths": [
+    // This file is deprecated and no longer present in master
     "images/cilium-test/Dockerfile"
   ],
   "ignoreDeps": [
@@ -148,8 +153,13 @@
       "fileMatch": [
         "images/cilium/download-hubble\\.sh"
       ],
+      // These regexes manage version and digest strings in shell scripts,
+      // similar to the examples shown here:
+      //   https://docs.renovatebot.com/modules/manager/regex/#advanced-capture
       "matchStrings": [
         "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+.+_version=\"(?<currentValue>.*)\"",
+        // The digestVersion in this regex is required for Renovate to be able
+        // to match the digest to the pinned version. It will not work without it.
         "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?) digestVersion=(?<currentValue>.*)\\s+.+_sha256.*=\"(?<currentDigest>.*)\""
       ]
     }

I can attempt to push directly to the branch if you'd like.

@aanm
Copy link
Member Author

aanm commented Feb 14, 2023

@gandro please do, I don't mind.

Now that the file supports comments, we can document the intent behind
some of those configuration options.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro
Copy link
Member

gandro commented Feb 14, 2023

@gandro please do, I don't mind.

Done!

@aanm aanm merged commit da14d37 into cilium:master Feb 14, 2023
@aanm aanm deleted the pr/do-not-upgrade-golang-1.20.0 branch February 14, 2023 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants