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

Add commit check job #4408

Closed
wants to merge 1 commit into from
Closed

Add commit check job #4408

wants to merge 1 commit into from

Conversation

Qard
Copy link
Contributor

@Qard Qard commented Jun 18, 2024

What does this PR do?

Adds a check to validate a PR does not contain merge commits

Motivation

A recent change landed without being squashed because changes from master were merged back to the PR. Merge commits should never be present given that we are supposed to always use squash to land feature PRs and rebase to land release proposal PRs.

@Qard Qard requested a review from a team as a code owner June 18, 2024 00:03
Copy link

github-actions bot commented Jun 18, 2024

Overall package size

Self size: 6.71 MB
Deduped: 61.96 MB
No deduping: 62.24 MB

Dependency sizes

name version self size total size
@datadog/native-appsec 8.0.1 15.59 MB 15.6 MB
@datadog/native-iast-taint-tracking 2.1.0 14.91 MB 14.92 MB
@datadog/pprof 5.3.0 9.85 MB 10.22 MB
protobufjs 7.2.5 2.77 MB 6.56 MB
@datadog/native-iast-rewriter 2.3.1 2.15 MB 2.24 MB
@opentelemetry/core 1.14.0 872.87 kB 1.47 MB
@datadog/native-metrics 2.0.0 898.77 kB 1.3 MB
@opentelemetry/api 1.8.0 1.21 MB 1.21 MB
import-in-the-middle 1.7.4 70.19 kB 739.86 kB
msgpack-lite 0.1.26 201.16 kB 281.59 kB
opentracing 0.14.7 194.81 kB 194.81 kB
semver 7.5.4 93.4 kB 123.8 kB
pprof-format 2.1.0 111.69 kB 111.69 kB
@datadog/sketches-js 2.1.0 109.9 kB 109.9 kB
lodash.sortby 4.7.0 75.76 kB 75.76 kB
lru-cache 7.14.0 74.95 kB 74.95 kB
ignore 5.2.4 51.22 kB 51.22 kB
int64-buffer 0.1.10 49.18 kB 49.18 kB
shell-quote 1.8.1 44.96 kB 44.96 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
tlhunter-sorted-set 0.1.0 24.94 kB 24.94 kB
limiter 1.1.5 23.17 kB 23.17 kB
dc-polyfill 0.1.4 23.1 kB 23.1 kB
retry 0.13.1 18.85 kB 18.85 kB
jest-docblock 29.7.0 8.99 kB 12.76 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
path-to-regexp 0.1.7 6.78 kB 6.78 kB
koalas 1.0.2 6.47 kB 6.47 kB
module-details-from-path 1.0.3 4.47 kB 4.47 kB

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@pr-commenter
Copy link

pr-commenter bot commented Jun 18, 2024

Benchmarks

Benchmark execution time: 2024-06-18 03:24:54

Comparing candidate commit 4837f2f in PR branch commit-check with baseline commit 3b479d0 in branch master.

Found 1 performance improvements and 0 performance regressions! Performance is the same for 258 metrics, 7 unstable metrics.

scenario:plugin-graphql-with-depth-on-max-18

  • 🟩 max_rss_usage [-131.689MB; -129.611MB] or [-13.575%; -13.361%]

Copy link
Collaborator

@bengl bengl left a comment

Choose a reason for hiding this comment

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

One thing to address, otherwise LGTM

.github/workflows/commit-check.yml Outdated Show resolved Hide resolved
@bengl bengl enabled auto-merge (squash) June 18, 2024 04:19
Copy link
Collaborator

@bengl bengl left a comment

Choose a reason for hiding this comment

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

On second thought, this isn't the right approach.

We shouldn't care whether PR branches have merge commits on them. We should care whether those end up on master, but that's part of the larger problem of not being able to enforce squash-merges only, because we also need rebase-merges for releases. This isn't the right solution to that though.

@bengl bengl closed this Jun 18, 2024
auto-merge was automatically disabled June 18, 2024 13:26

Pull request was closed

@Qard Qard deleted the commit-check branch June 18, 2024 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants