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

chore(ci): check if target branch is too old #11246

Merged
merged 5 commits into from
Nov 14, 2024
Merged

chore(ci): check if target branch is too old #11246

merged 5 commits into from
Nov 14, 2024

Conversation

erikayasuda
Copy link
Contributor

@erikayasuda erikayasuda commented Oct 31, 2024 •
edited by ZStriker19
Loading

We want to avoid backporting to release branches <=2.12, since the new release pipeline via GitLab is from 2.13 and anything older still uses the old GitHub Actions build pipeline. However, this does not run all tests the same way the GitLab pipeline does. In order to ensure consistent releases and testing on our releases, we should avoid backporting to <=2.12 unless there are specific asks.

This PR adds a GitHub actions check that sees if the target branch for a PR is <=2.12 (using regex). If it is, then it will fail the check and leave a comment on the PR. Making the check required will be a repo configuration (not in this PR).

See test PR with comment here: #11249
See test job failing on a 2.12 backport PR here

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

@github-actions GitHub Actions
Copy link
Contributor

CODEOWNERS have been resolved as:

.github/workflows/check_old_target_branch.yml                           @DataDog/python-guild @DataDog/apm-core-python

@pr-commenter
Copy link

pr-commenter bot commented Oct 31, 2024 •
edited
Loading

Benchmarks

Benchmark execution time: 2024-11-14 03:22:08

Comparing candidate commit 6a112bd in PR branch erikayasuda/old-target-branch-check with baseline commit 6dd6349 in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 388 metrics, 2 unstable metrics.

@erikayasuda erikayasuda added the changelog/no-changelog A changelog entry is not required for this PR. label Oct 31, 2024
@erikayasuda erikayasuda marked this pull request as ready for review October 31, 2024 18:35
@erikayasuda erikayasuda requested review from a team as code owners October 31, 2024 18:35
@erikayasuda
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 4, 2024

🚂 MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

@erikayasuda erikayasuda removed the changelog/no-changelog A changelog entry is not required for this PR. label Nov 4, 2024
@erikayasuda erikayasuda added changelog/no-changelog A changelog entry is not required for this PR. and removed mergequeue-status: waiting labels Nov 4, 2024
@erikayasuda erikayasuda closed this Nov 4, 2024
@erikayasuda erikayasuda reopened this Nov 4, 2024
@dd-devflow
Copy link

dd-devflow bot commented Nov 4, 2024

⚠️ MergeQueue: This merge request was unqueued

This pull request was closed.

If you need support, contact us on Slack #devflow!

@erikayasuda
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 4, 2024

🚂 MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

@dd-devflow
Copy link

dd-devflow bot commented Nov 4, 2024

🚂 MergeQueue: pull request added to the queue

The median merge time in main is 34m.

Use /merge -c to cancel this operation!

@dd-devflow
Copy link

dd-devflow bot commented Nov 13, 2024 •
edited
Loading

Devflow running: /merge

View all feedbacks in Devflow UI.

2024-11-13 22:37:11 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2024-11-13 22:37:14 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2024-11-14 01:57:36 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 35m.

2024-11-14 02:29:46 UTC ❌ MergeQueue: The checks failed on this merge request

Tests failed on this commit be18e31:

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • Any question, go check the FAQ.

@taegyunkim
Copy link
Contributor

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 14, 2024 •
edited
Loading

Devflow running: /merge

View all feedbacks in Devflow UI.

2024-11-14 02:42:18 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2024-11-14 02:42:21 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2024-11-14 03:24:49 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 35m.

2024-11-14 03:55:58 UTC ❌ MergeQueue: The checks failed on this merge request

Tests failed on this commit 9285c4e:

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • Any question, go check the FAQ.

@erikayasuda
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 14, 2024 •
edited
Loading

Devflow running: /merge

View all feedbacks in Devflow UI.

2024-11-14 21:17:27 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 37m.

2024-11-14 21:17:30 UTC ℹ️ MergeQueue: merge request added to the queue

The median merge time in main is 37m.

@dd-mergequeue dd-mergequeue bot merged commit bd0097f into main Nov 14, 2024
103 checks passed
@dd-mergequeue dd-mergequeue bot deleted the erikayasuda/old-target-branch-check branch November 14, 2024 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZStriker19 ZStriker19 ZStriker19 approved these changes

@emmettbutler emmettbutler emmettbutler approved these changes

Assignees
No one assigned
Labels
changelog/no-changelog A changelog entry is not required for this PR. mergequeue-status: done
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@erikayasuda @taegyunkim @emmettbutler @ZStriker19