feat: set backport release from config instead of current branch

npm · Sep 14, 2023 · 9c14575 · 9c14575
1 parent 2a5e186
commit 9c14575
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -12,7 +12,6 @@ const CONFIG_KEY = 'templateOSS'
 const getPkgConfig = (pkg) => pkg[CONFIG_KEY] || {}
 
 const { name: NAME, version: LATEST_VERSION } = require('../package.json')
-const { minimatch } = require('minimatch')
 const MERGE_KEYS = [...FILE_KEYS, 'defaultContent', 'content']
 const DEFAULT_CONTENT = require.resolve(NAME)
 
@@ -157,9 +156,9 @@ const getFullConfig = async ({
 
   const branches = uniq([...pkgConfig.branches ?? [], pkgConfig.releaseBranch]).filter(Boolean)
   const gitBranches = await git.getBranches(rootPkg.path, branches)
-  const currentBranch = await git.currentBranch(rootPkg.path)
-  const isReleaseBranch = currentBranch ? minimatch(currentBranch, pkgConfig.releaseBranch) : false
   const defaultBranch = await git.defaultBranch(rootPkg.path) ?? 'main'
+  const releaseBranch = pkgConfig.backport &&
+    pkgConfig.releaseBranch.replace('*', pkgConfig.backport)
 
   // all derived keys
   const derived = {
@@ -179,11 +178,10 @@ const getFullConfig = async ({
     // controls whether we are in a monorepo with any public workspaces
     isMonoPublic: isMono && !!publicPkgs.filter(p => p.path !== rootPkg.path).length,
     // git
-    defaultBranch,
-    baseBranch: isReleaseBranch ? currentBranch : defaultBranch,
     branches: gitBranches.branches,
     branchPatterns: gitBranches.patterns,
-    isReleaseBranch,
+    releaseBranch: releaseBranch ?? defaultBranch,
+    isReleaseBranch: !!releaseBranch,
     // dependabot
     dependabot: parseDependabot(pkgConfig, defaultConfig, gitBranches.branches),
     // repo

diff --git a/lib/content/ci-release.yml b/lib/content/ci-release.yml
@@ -7,7 +7,7 @@ on:
       ref:
         required: true
         type: string
-        default: {{ baseBranch }}
+        default: {{ releaseBranch }}
   workflow_call:
     inputs:
       ref:

diff --git a/lib/content/index.js b/lib/content/index.js
@@ -136,6 +136,8 @@ module.exports = {
   windowsCI: true,
   macCI: true,
   branches: ['main', 'latest'],
+  // set this to the major version to backport
+  backport: null,
   releaseBranch: 'release/v*',
   distPaths: [
     'bin/',

diff --git a/lib/util/git.js b/lib/util/git.js
@@ -66,17 +66,8 @@ const defaultBranch = async (path) => {
   }
 }
 
-const currentBranch = async (path) => {
-  try {
-    return await tryGit(path, 'rev-parse', '--abbrev-ref', 'HEAD')
-  } catch {
-    // ignore errors
-  }
-}
-
 module.exports = {
   getUrl,
   getBranches,
   defaultBranch,
-  currentBranch,
 }
diff --git a/test/apply/release.js b/test/apply/release.js
@@ -25,3 +25,18 @@ t.test('uses workspace flags in commands', async (t) => {
   t.notMatch(release, '--ignore-scripts\n')
   t.match(release, '--ignore-scripts -ws -iwr --if-present\n')
 })
+
+t.test('backport', async (t) => {
+  const s = await setup(t, {
+    package: {
+      templateOSS: {
+        backport: 8,
+      },
+    },
+  })
+  await s.apply()
+
+  const release = await s.readFile(join('.github', 'workflows', 'ci-release.yml'))
+
+  t.match(release, 'default: release/v8\n')
+})