diff --git a/renovate.json b/renovate.json index f855658382127d..5f3e8a90638978 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,9 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "labels": ["dependencies"], "enabledManagers": ["custom.regex"], + "baseBranches": ["main", "nschweitzer/renovate"], + "useBaseBranchConfig": "merge", "customManagers" : [ { "customType": "regex", @@ -18,11 +21,21 @@ "customType": "regex", "fileMatch": [".protoc-version"], "matchStrings": [ - "(?[0-9]+.[0-9]+)" + "(?[0-9]+.[0-9]+(-rc[0-9]+)?)" ], "depNameTemplate": "protoc", "versioningTemplate": "loose", "datasourceTemplate": "custom.protoc" + }, + { + "customType": "regex", + "fileMatch": ["release.json"], + "matchStrings": [ + "[ ]+\"OMNIBUS_RUBY_VERSION\": \"(?[a-z0-9]+)\"" + ], + "depNameTemplate": "omnibus-ruby", + "versioningTemplate": "loose", + "datasourceTemplate": "custom.omnibus-ruby" } ], "customDatasources": { @@ -37,6 +50,12 @@ "transformTemplates": [ "{\"releases\": $map($.[tag_name,published_at], function($v) { {\"version\": $v[0], \"releaseTimestamp\": $v[1] } }) }" ] + }, + "omnibus-ruby": { + "defaultRegistryUrlTemplate": "https://api.github.com/repos/datadog/omnibus-ruby/commits", + "transformTemplates": [ + "{\"releases\": $map($.[sha,commit.author.date], function($v) { {\"version\": $v[0], \"releaseTimestamp\": $v[1] } }) }" + ] } } } diff --git a/tasks/libs/pipeline/notifications.py b/tasks/libs/pipeline/notifications.py index 5193e219660a61..35175c7609dec2 100644 --- a/tasks/libs/pipeline/notifications.py +++ b/tasks/libs/pipeline/notifications.py @@ -191,6 +191,11 @@ def warn_new_commits(release_managers, team, branch, next_rc): message += f":announcement: We detected new commits on the {branch} release branch of `integrations-core`.\n" message += f"Could you please release and tag your repo to prepare the {next_rc} `datadog-agent` release candidate planned <{rc_schedule_link}|{rc_date.strftime('%Y-%m-%d %H:%M')}> UTC?\n" message += "Thanks in advance!\n" - message += f"cc {' '.join(release_managers)}" client = WebClient(os.environ["SLACK_API_TOKEN"]) + slack_ids = [] + for email in release_managers: + r = client.users_lookupByEmail(email=email) + if r.status_code == 200: + slack_ids.append(r.data["user"]["id"]) + message += f"cc {' '.join(f'<@{sid}>' for sid in slack_ids)}" client.chat_postMessage(channel=f"#{team}", text=message)