Merge pull request #3 from Cryptact/fix-skip-branch-check-on-gha

aminaz · web-flow · commit ab3d7858bb2c · 2025-03-25T13:26:24.000+09:00
fix: skip branch check when running on GHA
diff --git a/Makefile.js b/Makefile.js
@@ -79,7 +79,8 @@ target.releaseNext = () => {
 
 target.releaseLatest = async () => {
   const currentBranch = exec('git rev-parse --abbrev-ref HEAD').stdout.trim();
-  if (currentBranch !== 'master') {
+  console.log(`Current branch: ${currentBranch}`);
+  if (!process.env.GITHUB_ACTIONS && currentBranch !== 'master') {
     console.error('Must be on `master` branch to cut an @latest release.');
     return;
   }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cryptact/fontkit",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "An advanced font engine for Node and the browser",
   "main": "dist/fontkit.umd.js",
   "unpkg": "dist/fontkit.umd.min.js",

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ target.releaseNext = () => {`
`79`	`79`
`80`	`80`	`target.releaseLatest = async () => {`
`81`	`81`	`const currentBranch = exec('git rev-parse --abbrev-ref HEAD').stdout.trim();`
`82`		`- if (currentBranch !== 'master') {`
	`82`	+ console.log(`Current branch: ${currentBranch}`);
	`83`	`+ if (!process.env.GITHUB_ACTIONS && currentBranch !== 'master') {`
`83`	`84`	console.error('Must be on `master` branch to cut an @latest release.');
`84`	`85`	`return;`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@cryptact/fontkit",`
`3`		`- "version": "1.2.1",`
	`3`	`+ "version": "1.2.2",`
`4`	`4`	`"description": "An advanced font engine for Node and the browser",`
`5`	`5`	`"main": "dist/fontkit.umd.js",`
`6`	`6`	`"unpkg": "dist/fontkit.umd.min.js",`