We do not require Sign-off anymore, but use CLA instead.

This commit is contained in:
Benoit Marty
2024-12-13 16:10:21 +01:00
parent 18b97a4a56
commit 538936df9c
4 changed files with 1 additions and 69 deletions

View File

@@ -50,5 +50,4 @@ Uncomment this markdown table below and edit the last line `|||`:
- [ ] Pull request is based on the develop branch
- [ ] Pull request title will be used in the release note, it clearly define what will change for the user
- [ ] Pull request includes screenshots or videos if containing UI changes
- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
- [ ] You've made a self review of your PR

View File

@@ -24,7 +24,6 @@ Here are the checks that Danger does so far:
- Big PR got a warning to recommend to split
- PR contains a correct title and a label to categorize the release note
- PR does not modify frozen classes
- PR contains a Sign-Off, with exception for Element employee contributors
- PR with change on layout should include screenshot in the description (TODO Not supported yet!)
- PR which adds png file warn about the usage of vector drawables
- non draft PR should have a reviewer

View File

@@ -173,7 +173,7 @@ But comment in PR from the community are always appreciated!
4. Fork consideration. Will configuration of forks be easy? Some documentation may help in some cases.
5. We are building long term products. "Quick and dirty" code must be avoided.
6. The PR includes new tests for the added code, updated test for the existing code
7. All PRs from external contributors **MUST** include a sign-off. It's in the checklist, and sometimes it's checked by the submitter, but there is actually no sign-off. In this case, ask nicely for a sign-off and request changes (do not approve the PR, even if everything else is fine).
7. All commit authors must have signed the CLA. Please open https://cla-assistant.io/element-hq/element-x-android to agree to the CLA.
### Rules

View File

@@ -48,72 +48,6 @@ frozenClasses.forEach(frozen => {
}
)
// Check for a sign-off
const signOff = "Signed-off-by:"
// Please add new names following the alphabetical order.
const allowList = [
"aringenbach",
"BillCarsonFr",
"bmarty",
"csmith",
"dependabot[bot]",
"Florian14",
"ganfra",
"github-actions[bot]",
"jmartinesp",
"jonnyandrew",
"julioromano",
"kittykat",
"langleyd",
"MadLittleMods",
"manuroe",
"renovate[bot]",
"stefanceriu",
"yostyle",
]
function signoff_needed(reason) {
message("Sign-off required, " + reason)
const hasPRBodySignOff = pr.body.includes(signOff)
const hasCommitSignOff = danger.git.commits.every(commit => commit.message.includes(signOff))
if (!hasPRBodySignOff && !hasCommitSignOff) {
fail("Please add a sign-off to either the PR description or to the commits themselves. See instructions [here](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off).")
}
}
function signoff_unneeded(reason) {
message("Sign-off not required, " + reason)
}
// Somewhat awkward phrasing, dangerfile is not in an async context.
if (allowList.includes(user)) {
signoff_unneeded("allow-list")
} else {
// github.api.rest.orgs.checkMembershipForUser({
// org: "element-hq",
// username: user,
// }).then((result) => {
github.api.rest.teams.getMembershipForUserInOrg({
org: "element-hq",
team_slug: "vector-core",
username: user,
}).then((result) => {
if (result.status == 204 || result.status == 200) {
signoff_unneeded("team-member")
}
else {
signoff_needed("not-team-member")
}
}).catch((error) => {
if (error.response.status == 404) {
signoff_needed("not-team-member");
} else {
console.log(error); signoff_needed("error")
}
})
}
const previewAnnotations = [
'androidx.compose.ui.tooling.preview.Preview',
'io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight',