ci: fix git-cliff usage in publish-docs

radashi-org · Aug 24, 2024 · 2d4bf65 · 2d4bf65
1 parent 368d51e
commit 2d4bf65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scripts/docs/ci-publish-docs.ts b/scripts/docs/ci-publish-docs.ts
@@ -45,9 +45,12 @@ async function main() {
       newVersion = tag.slice(1)
       metaId = 'stable_version'
     } else if (tag === 'beta' || tag === 'next') {
-      newVersion = await execa('git-cliff', ['--bumped-version']).then(r =>
+      const gitCliffBin = './scripts/versions/node_modules/.bin/git-cliff'
+
+      newVersion = await execa(gitCliffBin, ['--bumped-version']).then(r =>
         r.stdout.replace(/^v/, ''),
       )
+
       if (tag === 'next') {
         newVersion += '-alpha'
         // Compare against the last alpha version.

diff --git a/scripts/versions/src/publishVersion.ts b/scripts/versions/src/publishVersion.ts
@@ -26,9 +26,6 @@ export async function publishVersion(args: {
   deployKey?: string
   nightlyDeployKey?: string
 }) {
-  const gitCliffBin = './scripts/versions/node_modules/.bin/git-cliff'
-  const octokit = new Octokit({ auth: args.radashiBotToken })
-
   // Determine the last stable version
   const { stdout: stableVersion } = await execa('npm', [
     'view',
@@ -38,6 +35,8 @@ export async function publishVersion(args: {
 
   log(`Last stable version: ${stableVersion}`)
 
+  const gitCliffBin = './scripts/versions/node_modules/.bin/git-cliff'
+
   // Determine the next version
   let newVersion = await execa(gitCliffBin, ['--bumped-version'], {
     env: { GITHUB_TOKEN: args.gitCliffToken },
@@ -208,6 +207,8 @@ export async function publishVersion(args: {
     stdio: 'inherit',
   })
 
+  const octokit = new Octokit({ auth: args.radashiBotToken })
+
   log('Dispatching publish-docs workflow')
   await octokit.actions.createWorkflowDispatch({
     owner: 'radashi-org',