ci: allow commits on top of beta PRs (#11924)
This commit is contained in:
@@ -128,10 +128,15 @@ async function main() {
|
||||
await $`git fetch origin beta`
|
||||
|
||||
const localTree = await $`git rev-parse beta^{tree}`.text()
|
||||
const remoteTree = await $`git rev-parse origin/beta^{tree}`.text()
|
||||
const remoteTrees = (await $`git log origin/dev..origin/beta --format=%T`.text()).split("\n")
|
||||
|
||||
if (localTree.trim() === remoteTree.trim()) {
|
||||
console.log("Beta branch has identical contents, no push needed")
|
||||
const matchIdx = remoteTrees.indexOf(localTree.trim())
|
||||
if (matchIdx !== -1) {
|
||||
if (matchIdx !== 0) {
|
||||
console.log(`Beta branch contains this sync, but additional commits exist after it. Leaving beta branch as is.`)
|
||||
} else {
|
||||
console.log("Beta branch has identical contents, no push needed")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user