Tighten match when checking for updated pcre2
What does this MR do?
Tighten the match pattern for PCRE2 in deps.yml to not include RC tags. Match pattern goes from matching: 'pcre2-(\d+).(\d+)'
to matching: 'pcre2-(\d+).(\d+)$'
. This will prevent RC releases from matching.
Related issues
- Related !7322 (closed)
Checklist
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion.
Required
-
MR title and description are up to date, accurate, and descriptive. -
MR targeting the appropriate branch. -
Latest Merge Result pipeline is green. -
When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.
For GitLab team members
If you don't have access to this, the reviewer should trigger these jobs for you during the review process.
-
The manual Trigger:ee-package
jobs have a green pipeline running against latest commit. -
If config/software
orconfig/patches
directories are changed, make sure thebuild-package-on-all-os
job within theTrigger:ee-package
downstream pipeline succeeded. -
If you are changing anything SSL related, then the Trigger:package:fips
manual job within theTrigger:ee-package
downstream pipeline must succeed. -
If CI configuration is changed, the branch must be pushed to dev.gitlab.org
to confirm regular branch builds aren't broken.
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes. -
Documentation created/updated. -
Tests added. -
Integration tests added to GitLab QA. -
Equivalent MR/issue for the GitLab Chart opened. -
Validate potential values for new configuration settings. Formats such as integer 10
, duration10s
, URIscheme://user:passwd@host:port
may require quotation or other special handling when rendered in a template and written to a configuration file.
Test plan
-
Run deps update when RC release exists. No updates should occur. $ docker run -it --rm --name deps-ci -v ~/gitlab/git/gitlab.com/omnibus-gitlab:/omnibus-gitlab registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/distribution_ci_tools:5.2.0 # cd /tmp # git clone -b tighten-pcre2-deps-regexp https://gitlab.com/gitlab-org/omnibus-gitlab.git # curl https://deps.app/install.sh | bash -s -- -b $HOME/bin # $HOME/bin/deps update | grep -i pcre2
-
Make sure deps detects normal release changes. $ docker run -it --rm --name deps-ci -v ~/gitlab/git/gitlab.com/omnibus-gitlab:/omnibus-gitlab registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/distribution_ci_tools:5.2.0 # cd /tmp # git clone -b tighten-pcre2-deps-regexp https://gitlab.com/gitlab-org/omnibus-gitlab.git # # Edit config/software/pcre2.rb and set version to previous release. # diff --git a/config/software/pcre2.rb b/config/software/pcre2.rb index cd1bee83c..49ab2dccf 100644 --- a/config/software/pcre2.rb +++ b/config/software/pcre2.rb @@ -16,7 +16,7 @@ name 'pcre2' -version = Gitlab::Version.new('pcre2', 'pcre2-10.42') +version = Gitlab::Version.new('pcre2', 'pcre2-10.41') default_version version.print(false) display_version version.print(false).delete_prefix('pcre2-') # $HOME/bin/deps update | grep -i pcre2 [3b2dd78] Update PCRE2Project/pcre2 from pcre2-10.41 to pcre2-10.42
Merge request reports
Activity
changed milestone to %16.9
added devopssystems groupdistribution sectioncore platform labels
assigned to @apatterson2
2 Warnings Please add a merge request subtype to this merge request. Please add a merge request type to this merge request. 2 Messages CHANGELOG missing: If you want to create a changelog entry for GitLab FOSS, add the
Changelog
trailer to the commit message you want to add to the changelog.If you want to create a changelog entry for GitLab EE, also add the
EE: true
trailer to your commit message.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Once your MR is ready for review you can comment @gitlab-bot ready <@user>
to request the first review to someone. It's recommended that you pick the one suggested by the reviewer roulette. But you can ignore it and assign it to someone else if you see fit.Merge requests are handled according to the workflow documented in our handbook and should receive a response within the limit documented in our Service-level objective (SLO).
If you don't receive a response from the reviewer within the SLO, please mention
@gitlab-org/distribution
, or one of our Project MaintainersReviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not automatically notify them for you.
Reviewer Maintainer @Alexand
(UTC+0, 7 hours ahead of
@apatterson2
)@rmarshall
(UTC-5, 2 hours ahead of
@apatterson2
)If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger- Resolved by 🤖 GitLab Bot 🤖
Proper labels assigned to this merge request. Please ignore me.
@apatterson2 - please see the following guidance and update this merge request.1 Error Please add typebug typefeature, or typemaintenance label to this merge request. Edited by 🤖 GitLab Bot 🤖
added typemaintenance label
mentioned in merge request !7322 (closed)
Green pipeline at https://gitlab.com/gitlab-org/omnibus-gitlab/-/pipelines/1135569560.
marked the checklist item When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow. as completed
added workflowready for review label
requested review from @Alexand
Thanks, @apatterson2. LGTM!
@balasankarc, could you please review?
requested review from @balasankarc and removed review request for @Alexand
mentioned in commit 84fef64b
added workflowstaging-canary label and removed workflowready for review label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
added releasedcandidate label
added releasedpublished label and removed releasedcandidate label