fix: add correct publish tag for backports

npm · Jul 10, 2023 · ba07c1a · ba07c1a
1 parent 3aa4591
commit ba07c1a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -169,7 +169,7 @@ jobs:
           RELEASE_COMMENT_ID: ${{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=true
+          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=true --tag=latest
           npm run rp-pull-request --ignore-scripts -ws -iwr --if-present
       - name: Commit
         id: commit
@@ -337,7 +337,7 @@ jobs:
       - name: Publish
         env:
           PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-        run: npm publish --provenance
+        run: npm publish --provenance --tag=latest
 
   post-release-integration:
     needs: [ release, release-integration ]

diff --git a/bin/release-manager.js b/bin/release-manager.js
@@ -11,8 +11,14 @@ const ROOT = process.cwd()
 const pkg = require(join(ROOT, 'package.json'))
 
 const args = process.argv.slice(2).reduce((acc, a) => {
-  const [k, v] = a.replace(/^--/g, '').split('=')
-  acc[k] = v === 'true'
+  const [k, v] = a.replace(/^--/, '').split('=')
+  if (v === 'true') {
+    acc[k] = true
+  } else if (v === 'false') {
+    acc[k] = false
+  } else if (v && typeof v === 'string') {
+    acc[k] = v.trim()
+  }
   return acc
 }, {})
 
@@ -135,7 +141,7 @@ const getPrReleases = async (pr) => {
       version: rawVersion,
       major: version.major,
       url: `https://github.com/${pr.base.repo.full_name}/releases/tag/${tag}`,
-      flags: `${name ? `-w ${workspace}` : ''} ${prerelease ? `--tag prerelease` : ''}`.trim(),
+      flags: `${name ? `-w ${workspace}` : ''} --tag ${args.tag}`.trim(),
     }
   }
 

diff --git a/lib/config.js b/lib/config.js
@@ -159,11 +159,7 @@ const getFullConfig = async ({
   const gitBranches = await git.getBranches(rootPkg.path, branches)
   const currentBranch = await git.currentBranch(rootPkg.path)
   const isReleaseBranch = currentBranch ? minimatch(currentBranch, pkgConfig.releaseBranch) : false
-<<<<<<< HEAD
   const defaultBranch = await git.defaultBranch(rootPkg.path) ?? 'main'
-=======
-  const defaultBranch = await git.defaultBranch(rootPkg.path) ?? pkgConfig.defaultBranch ?? 'main'
->>>>>>> d50eee3 (feat: use git remote for branch related config)
 
   // all derived keys
   const derived = {

diff --git a/lib/content/_job-release-integration.yml b/lib/content/_job-release-integration.yml
@@ -22,7 +22,7 @@ steps:
   - name: Publish
     env:
       PUBLISH_TOKEN: $\{{ secrets.PUBLISH_TOKEN }}
-    run: npm publish --provenance
+    run: npm publish --provenance --tag={{ publishTag }}
 {{else}}
 runs-on: ubuntu-latest
 defaults:

diff --git a/lib/content/release.yml b/lib/content/release.yml
@@ -84,7 +84,7 @@ jobs:
           RELEASE_COMMENT_ID: $\{{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
         run: |
-          {{ rootNpmPath }} exec --offline -- template-oss-release-manager --lockfile={{ lockfile }} --publish={{ publish }}
+          {{ rootNpmPath }} exec --offline -- template-oss-release-manager --lockfile={{ lockfile }} --publish={{ publish }} --tag={{ publishTag }}
           {{ rootNpmPath }} run rp-pull-request --ignore-scripts {{~#if allFlags}} {{ allFlags }}{{else}} --if-present{{/if}}
       - name: Commit
         id: commit

diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs
@@ -988,7 +988,7 @@ jobs:
           RELEASE_COMMENT_ID: \${{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
         run: |
-          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false
+          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false --tag=latest
           npm run rp-pull-request --ignore-scripts --if-present
       - name: Commit
         id: commit
@@ -2668,7 +2668,7 @@ jobs:
           RELEASE_COMMENT_ID: \${{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
         run: |
-          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false
+          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false --tag=latest
           npm run rp-pull-request --ignore-scripts -ws -iwr --if-present
       - name: Commit
         id: commit
@@ -4200,7 +4200,7 @@ jobs:
           RELEASE_COMMENT_ID: \${{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
         run: |
-          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false
+          npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false --tag=latest
           npm run rp-pull-request --ignore-scripts -ws -iwr --if-present
       - name: Commit
         id: commit