Merge pull request #199 from technote-space/release/v0.7.4

Release/v0.7.4

Author: technote-space

.github/workflows/pr_opened.yml

@@ -1,33 +1,33 @@
-on:
-  pull_request:
-    types: [opened]
-name: Pull Request opened
-jobs:
-  assignToProject:
-    name: Assign PullRequest to Project
-    runs-on: ubuntu-latest
-    steps:
-      - name: Assign PullRequest to Project
-        uses: alex-page/[email protected]
-        with:
-          project: Backlog
-          column: To do
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-  assignAuthor:
-    name: Assign author to PR
-    runs-on: ubuntu-latest
-    steps:
-      - name: Assign Author to PR
-        uses: technote-space/assign-author@v1
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  addLabelsByBranch:
-    name: PR Labeler
-    runs-on: ubuntu-latest
-    steps:
-      - name: PR Labeler
-        uses: technote-fork/pr-labeler-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+on:
+  pull_request:
+    types: [opened]
+name: Pull Request opened
+jobs:
+  assignToProject:
+    name: Assign PullRequest to Project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Assign PullRequest to Project
+        uses: alex-page/[email protected]
+        with:
+          project: Backlog
+          column: To do
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+  assignAuthor:
+    name: Assign author to PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Assign Author to PR
+        uses: technote-space/assign-author@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  addLabelsByBranch:
+    name: PR Labeler
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Labeler
+        uses: technote-fork/pr-labeler-action@gh-actions
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

__tests__/git-helper.test.ts

@@ -43,7 +43,7 @@ describe('GitHelper', () => {
 		});
 
 		it('should get current branch name', async() => {
-			setChildProcessParams({stdout: '  master\n* test-branch\n  develop'});
+			setChildProcessParams({stdout: 'test-branch'});
 			expect(await helper.getCurrentBranchName(workDir)).toBe('test-branch');
 		});
 	});

__tests__/utils.test.ts

@@ -3,9 +3,9 @@ import path from 'path';
 import { testEnv, getContext, testFs } from '@technote-space/github-action-test-helper';
 import { Utils } from '../src';
 
-const {getWorkspace, getActor, escapeRegExp, getRegExp, getPrefixRegExp, getSuffixRegExp, useNpm, versionCompare}   = Utils;
-const {isSemanticVersioningTagName, isPrRef, getPrMergeRef, getBoolValue, replaceAll, getPrHeadRef, arrayChunk}     = Utils;
-const {getBranch, getRefForUpdate, uniqueArray, getBuildInfo, split, getArrayInput, generateNewPatchVersion, sleep} = Utils;
+const {getWorkspace, getActor, escapeRegExp, getRegExp, getPrefixRegExp, getSuffixRegExp, useNpm, versionCompare}         = Utils;
+const {isSemanticVersioningTagName, isPrRef, getPrMergeRef, getBoolValue, replaceAll, getPrHeadRef, arrayChunk, sleep}    = Utils;
+const {getBranch, getRefForUpdate, uniqueArray, getBuildInfo, split, getArrayInput, generateNewPatchVersion, getPrBranch} = Utils;
 
 jest.useFakeTimers();
 
@@ -219,6 +219,24 @@ describe('getBranch', () => {
 	});
 });
 
+describe('getPrBranch', () => {
+	it('should get pr branch', () => {
+		expect(getPrBranch(getContext({
+			payload: {
+				'pull_request': {
+					head: {
+						ref: 'test/abc',
+					},
+				},
+			},
+		}))).toBe('test/abc');
+	});
+
+	it('should not get pr branch', () => {
+		expect(getPrBranch(getContext({}))).toBe('');
+	});
+});
+
 describe('getRefForUpdate', () => {
 	// https://github.com/octokit/rest.js/issues/1308#issuecomment-480532468
 	it('should get ref for update', () => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/github-action-helper",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Helper to filter GitHub Action.",
   "author": "Technote <[email protected]> (https://technote.space)",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "sprintf-js": "^1.1.2"
   },
   "devDependencies": {
-    "@technote-space/github-action-test-helper": "^0.1.1",
+    "@technote-space/github-action-test-helper": "^0.1.2",
     "@types/jest": "^24.9.0",
     "@types/node": "^13.1.8",
     "@typescript-eslint/eslint-plugin": "^2.16.0",

src/git-helper.ts

@@ -125,8 +125,7 @@ export default class GitHelper {
 		if (!isCloned(workDir)) {
 			return '';
 		}
-		// eslint-disable-next-line no-magic-numbers
-		return (await this.runCommand(workDir, {command: 'git branch', args: ['-a']}))[0].stdout.find(branch => branch.startsWith('*'))?.slice(2).trim() ?? '';
+		return (await this.runCommand(workDir, {command: 'git rev-parse', args: ['--abbrev-ref', 'HEAD']}))[0].stdout[0]?.trim() ?? '';
 	};
 
 	/**

src/utils.ts

@@ -52,6 +52,8 @@ export const getBranch = (ref: string | Context, defaultIsEmpty = true): string
 				)
 		);
 
+export const getPrBranch = (context: Context): string => context.payload.pull_request?.head.ref ?? '';
+
 export const getAccessToken = (required: boolean): string => getInput('GITHUB_TOKEN', {required});
 
 export const getActor = (): string => process.env.GITHUB_ACTOR || '';

yarn.lock

@@ -360,16 +360,16 @@
     universal-user-agent "^4.0.0"
 
 "@octokit/types@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.0.2.tgz#0888497f5a664e28b0449731d5e88e19b2a74f90"
-  integrity sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.1.0.tgz#fe3ea39ed7d20ec06954a9314d4f17aa93e033a3"
+  integrity sha512-n1GUYFgKm5glcy0E+U5jnqAFY2p04rnK4A0YhuM70C7Vm9Vyx+xYwd/WOTEr8nUJcbPSR/XL+/26+rirY6jJQA==
   dependencies:
     "@types/node" ">= 8"
 
-"@technote-space/github-action-test-helper@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@technote-space/github-action-test-helper/-/github-action-test-helper-0.1.1.tgz#6480b5516cc7e9291685226caa31f58671e3e11f"
-  integrity sha512-K6ebxvzskzjTZeK75Ymbg0F0CyZRLMAewjHiiWguyn1HfIKGllJxLhS0TSApJo3092+VsDSiPCYTeL+nQTMEVg==
+"@technote-space/github-action-test-helper@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@technote-space/github-action-test-helper/-/github-action-test-helper-0.1.2.tgz#50d37d9487da0a41650aa645c75fce71711ec55d"
+  integrity sha512-uA1fjmcWP/x9o1RA/D6cXZtptanTXEBbe1DLC1Ia/cO42/IeLQXvmJ7ICogWVMgA9OG5xWFqolGdc3ygXF1qZg==
   dependencies:
     "@actions/github" "^2.0.1"
     js-yaml "^3.13.1"
@@ -1193,9 +1193,9 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
-  version "1.17.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.2.tgz#965b10af56597b631da15872c17a405e86c1fd46"
-  integrity sha512-YoKuru3Lyoy7yVTBSH2j7UxTqe/je3dWAruC0sHvZX1GNd5zX8SSLvQqEgO9b3Ex8IW+goFI9arEEsFIbulhOw==
+  version "1.17.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.3.tgz#d921ff5889a3664921094bb13aaf0dfd11818578"
+  integrity sha512-AwiVPKf3sKGMoWtFw0J7Y4MTZ4Iek67k4COWOwHqS8B9TOZ71DCfcoBmdamy8Y6mj4MDz0+VNUpC2HKHFHA3pg==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"