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

Blindpirate merge release into master #27

Open
wants to merge 48 commits into
base: master
Choose a base branch
from

Conversation

blindpirate
Copy link
Owner

Context

Contributor Checklist

  • Review Contribution Guidelines
  • Make sure that all commits are signed off to indicate that you agree to the terms of Developer Certificate of Origin.
  • Make sure all contributed code can be distributed under the terms of the Apache License 2.0, e.g. the code was written by yourself or the original code is licensed under a license compatible to Apache License 2.0.
  • Check "Allow edit from maintainers" option in pull request so that additional changes can be pushed by Gradle team
  • Provide integration tests (under <subproject>/src/integTest) to verify changes from a user perspective
  • Provide unit tests (under <subproject>/src/test) to verify logic
  • Update User Guide, DSL Reference, and Javadoc for public-facing changes
  • Ensure that tests pass sanity check: ./gradlew sanityCheck
  • Ensure that tests pass locally: ./gradlew <changed-subproject>:quickTest

Reviewing cheatsheet

Before merging the PR, comments starting with

  • ❌ ❓must be fixed
  • 🤔 💅 should be fixed
  • 💭 may be fixed
  • 🎉 celebrate happy things

@blindpirate blindpirate force-pushed the blindpirate-merge-release-into-master branch from 69bee49 to 9633e17 Compare August 7, 2023 12:05
@blindpirate blindpirate force-pushed the blindpirate-merge-release-into-master branch from 9633e17 to 9e9e5e6 Compare August 7, 2023 12:14
@github-actions
Copy link

github-actions bot commented Aug 7, 2023

Some bad merge is found:


@blindpirate blindpirate force-pushed the blindpirate-merge-release-into-master branch from 9e9e5e6 to 6efceed Compare August 7, 2023 12:31
@github-actions
Copy link

github-actions bot commented Aug 7, 2023

Some bad merge is found:


@blindpirate blindpirate force-pushed the blindpirate-merge-release-into-master branch from 6efceed to cbcedfd Compare August 7, 2023 12:34
@github-actions
Copy link

github-actions bot commented Aug 7, 2023

Some bad merge is found:


@blindpirate blindpirate force-pushed the blindpirate-merge-release-into-master branch from cbcedfd to f8ee0c1 Compare August 7, 2023 12:45
@github-actions
Copy link

github-actions bot commented Aug 7, 2023

Some bad merge is found:

Commits to check: [f8ee0c1f17ff91789a6c4ae667aa7ea0309beee4, 3e407ee5b9b762c73daa01c0d04a9be239e6c5d8, f4c835c423e08a84dd53434512c74471742b7711, 808ac07e5008b7109e85af502554e02dbaa5fddd, a7e6baca1cdf31c1e47e104b21176800da765f42, 91844cf8090104c5e78c8c5b7a86d10d1482dbd9, d98afc56869c1d5b0f4747d63bb4d8ed2b5d789c, 0da07982425a5902267572f6ae22ec87da7b0aef]
Found bad file subprojects/docs/src/docs/release/notes.md in merge commit f8ee0c1f17ff91789a6c4ae667aa7ea0309beee4: 'This release features [1](), [2](), ... [n](), and more. change on release' only exists in 3e407ee5b9b762c73daa01c0d04a9be239e6c5d8 but not in c42416792e9d29eaf829f6daf94b940fae5a198c

@blindpirate blindpirate force-pushed the blindpirate-merge-release-into-master branch from f8ee0c1 to 7e577c8 Compare August 7, 2023 12:51
@github-actions
Copy link

github-actions bot commented Aug 7, 2023

Some bad merge is found:

WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by org.codehaus.groovy.reflection.CachedClass (file:/usr/share/groovy/lib/groovy-2.4.21.jar) to method java.lang.Object.finalize()
WARNING: Please consider reporting this to the maintainers of org.codehaus.groovy.reflection.CachedClass
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
Commits to check: [7e577c81b3cac18e16f5403895b13b0f301f1af5, 6e994214405ec11abe229139d4f06909ff441c6f, 3e407ee5b9b762c73daa01c0d04a9be239e6c5d8, f4c835c423e08a84dd53434512c74471742b7711, 808ac07e5008b7109e85af502554e02dbaa5fddd, a7e6baca1cdf31c1e47e104b21176800da765f42, 91844cf8090104c5e78c8c5b7a86d10d1482dbd9, d98afc56869c1d5b0f4747d63bb4d8ed2b5d789c, 0da07982425a5902267572f6ae22ec87da7b0aef]
Found bad file subprojects/docs/src/docs/release/notes.md in merge commit 7e577c81b3cac18e16f5403895b13b0f301f1af5: 'This release features [1](), [2](), ... [n](), and more. change on release' only exists in 6e994214405ec11abe229139d4f06909ff441c6f but not in 6064c2fd8cfdae3781251c55e410dada7ed72bd7
Caught: java.lang.RuntimeException: Found bad files in merge commit 7e577c81b3cac18e16f5403895b13b0f301f1af5: [subprojects/docs/src/docs/release/notes.md]
java.lang.RuntimeException: Found bad files in merge commit 7e577c81b3cac18e16f5403895b13b0f301f1af5: [subprojects/docs/src/docs/release/notes.md]
	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
	at CheckBadMerge.checkCommit(CheckBadMerge.groovy:50)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at CheckBadMerge$_main_closure1.doCall(CheckBadMerge.groovy:26)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at CheckBadMerge.main(CheckBadMerge.groovy:26)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

@github-actions
Copy link

github-actions bot commented Oct 6, 2023

This pull request has been automatically marked as stale because it has not had recent activity. Given the limited bandwidth of the team, it will be closed if no further activity occurs. If you intend to work on this pull request, please ask the team to reopen the PR or push a new PR. Thank you for your contributions.

@github-actions github-actions bot added the stale label Oct 6, 2023
bot-gradle added a commit to gradle/gradle that referenced this pull request Dec 7, 2023
See gradle/gradle-private#3919

This PR adds a GitHub workflow to check if there is "bad merge commit" when a PR is pushed. If there's anything wrong found, there will be a warning commented in the PR.

Here is an example of how it works: blindpirate#27

Co-authored-by: Bo Zhang <bo@gradle.com>
bot-gradle added a commit to gradle/gradle that referenced this pull request Dec 7, 2023
See gradle/gradle-private#3919

This PR adds a GitHub workflow to check if there is "bad merge commit" when a PR is pushed. If there's anything wrong found, there will be a warning commented in the PR.

Here is an example of how it works: blindpirate#27

Co-authored-by: Bo Zhang <bo@gradle.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
1 participant