re-enable release proposal dont-land-on checks (#5665)

Author: rochdev

scripts/release/proposal.js

@@ -66,21 +66,10 @@ try {
 
   pass(`v${releaseLine}.x`)
 
-  const diffCmd =
-    `branch-diff --user DataDog --repo dd-trace-js --exclude-label=semver-major,dont-land-on-v${releaseLine}.x`
+  const diffCmd = 'branch-diff --user DataDog --repo dd-trace-js --exclude-label=semver-major'
 
   start('Determine version increment')
 
-  const legacyDiff = capture(`${diffCmd} --require-label=dont-land-on-v${releaseLine}.x v${releaseLine}.x ${main}`)
-
-  if (legacyDiff) {
-    // TODO: Re-enable this when the offending PR commits have landed properly.
-    // fatal(
-    //   `The "dont-land-on-v${releaseLine}.x" label is no longer supported.`,
-    //   'Please remove the label from any offending PR to continue.'
-    // )
-  }
-
   const { DD_MAJOR, DD_MINOR, DD_PATCH } = require('../../version')
   const lineDiff = capture(`${diffCmd} --markdown=true v${releaseLine}.x ${main}`)
 

scripts/release/validate.js

@@ -37,15 +37,16 @@ try {
 
   start('Pull release branch')
 
-  const proposalBranch = params[0] || capture('git rev-parse --abbrev-ref HEAD')
+  const currentBranch = capture('git rev-parse --abbrev-ref HEAD')
+  const proposalBranch = params[0] || currentBranch
   const tempBranch = randomUUID()
   const newVersion = proposalBranch.match(/^v([0-9]+\.[0-9]+\.[0-9]+).+/)[1]
   const releaseLine = newVersion.match(/^([0-9]+).+/)[1]
 
   // Restore current branch on success.
   process.once('exit', code => {
     if (code === 0) {
-      run(`git checkout ${proposalBranch}`)
+      run(`git checkout ${currentBranch}`)
     }
 
     run(`git branch -D ${tempBranch}`)
@@ -57,12 +58,7 @@ try {
 
   pass()
 
-  const diffCmd = [
-    'branch-diff',
-    '--user DataDog',
-    '--repo dd-trace-js',
-    `--exclude-label=semver-major,dont-land-on-v${releaseLine}.x`
-  ].join(' ')
+  const diffCmd = 'branch-diff --user DataDog --repo dd-trace-js --exclude-label=semver-major'
 
   start('Validate differences between proposal and main branch.')