chore: more canary adjustments...

pavinthan · Aug 19, 2021 · ae01a8c · ae01a8c
1 parent fba6c78
commit ae01a8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -58,6 +58,10 @@ jobs:
           npm-token: ${{ secrets.NODE_AUTH_TOKEN }}
           npm-script: 'yarn release:canary'
           changesets: true
+        env:
+          ON_DEMAND: ${{github.event.inputs.onDemand}}
+          NPM_TAG: ${{github.event.inputs.npmTag || 'alpha'}}
+          NPM_VERSION_SUFFIX: ${{github.event.inputs.npmVersionSuffix}}
       - name: Publish a message
         if: steps.canary.outputs.released
         uses: 'kamilkisiela/pr-comment@master'

diff --git a/scripts/canary-release.js b/scripts/canary-release.js
@@ -10,9 +10,12 @@ const applyReleasePlan = require("@changesets/apply-release-plan").default;
 const { getPackages } = require("@manypkg/get-packages");
 
 function getNewVersion(version, type) {
-  const gitHash = cp.spawnSync('git', ['rev-parse', '--short', 'HEAD']).stdout.toString().trim();
-
-  return semver.inc(version, `pre${type}`, true, 'alpha-' + gitHash);
+  let npmVersionSuffix = process.env.NPM_VERSION_SUFFIX;
+  if (!npmVersionSuffix) {
+    const gitHash = cp.spawnSync('git', ['rev-parse', '--short', 'HEAD']).stdout.toString().trim();
+    npmVersionSuffix = `alpha-${gitHash}`;
+  }
+  return semver.inc(version, `pre${type}`, true, npmVersionSuffix);
 }
 
 function getRelevantChangesets(baseBranch) {