Merge pull request #304 from technote-space/release/next-v3.4.0

release: v3.5.0

Author: technote-space

__tests__/git-helper.test.ts

@@ -124,7 +124,7 @@ describe('GitHelper', () => {
 
       execCalledWith(mockExec, [
         'git remote add origin \'https://octocat:token1@github.com/hello/world.git\' > /dev/null 2>&1 || :',
-        'git fetch --no-tags origin \'refs/pull/123/merge:refs/pull/123/merge\' || :',
+        'git fetch --no-tags origin \'refs/pull/123/merge:refs/remotes/origin/pull/123/merge\' || :',
         'git checkout -qf test-sha',
       ]);
     });

__tests__/utils2.test.ts

@@ -170,7 +170,7 @@ describe('getRefspec', () => {
     expect(getRefspec('master')).toBe('refs/heads/master:refs/remotes/origin/master');
     expect(getRefspec('refs/heads/master', 'test')).toBe('refs/heads/master:refs/remotes/test/master');
     expect(getRefspec('refs/tags/v1.2.3')).toBe('refs/tags/v1.2.3:refs/tags/v1.2.3');
-    expect(getRefspec('refs/pull/123/merge')).toBe('refs/pull/123/merge:refs/pull/123/merge');
+    expect(getRefspec('refs/pull/123/merge')).toBe('refs/pull/123/merge:refs/remotes/origin/pull/123/merge');
   });
 });
 
@@ -188,7 +188,7 @@ describe('getLocalRefspec', () => {
     expect(getLocalRefspec('master')).toBe('origin/master');
     expect(getLocalRefspec('refs/heads/master', 'test')).toBe('test/master');
     expect(getLocalRefspec('refs/tags/v1.2.3')).toBe('tags/v1.2.3');
-    expect(getLocalRefspec('refs/pull/123/merge')).toBe('pull/123/merge');
+    expect(getLocalRefspec('refs/pull/123/merge')).toBe('origin/pull/123/merge');
   });
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/github-action-helper",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "Helper for GitHub Action.",
   "author": {
     "name": "Technote",
@@ -28,23 +28,23 @@
   "dependencies": {
     "@actions/core": "^1.2.5",
     "@actions/github": "^4.0.0",
-    "@octokit/plugin-rest-endpoint-methods": "^4.1.3",
+    "@octokit/plugin-rest-endpoint-methods": "^4.1.4",
     "shell-escape": "^0.2.0",
     "sprintf-js": "^1.1.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^9.1.2",
     "@commitlint/config-conventional": "^9.1.2",
-    "@technote-space/github-action-test-helper": "^0.5.6",
-    "@types/jest": "^26.0.12",
-    "@types/node": "^14.6.2",
-    "@typescript-eslint/eslint-plugin": "^4.0.1",
-    "@typescript-eslint/parser": "^4.0.1",
-    "eslint": "^7.8.0",
-    "husky": "^4.2.5",
+    "@technote-space/github-action-test-helper": "^0.5.7",
+    "@types/jest": "^26.0.13",
+    "@types/node": "^14.10.0",
+    "@typescript-eslint/eslint-plugin": "^4.1.0",
+    "@typescript-eslint/parser": "^4.1.0",
+    "eslint": "^7.8.1",
+    "husky": "^4.3.0",
     "jest": "^26.4.2",
     "jest-circus": "^26.4.2",
-    "lint-staged": "^10.2.13",
+    "lint-staged": "^10.3.0",
     "nock": "^13.0.4",
     "ts-jest": "^26.3.0",
     "typescript": "^4.0.2"

src/utils.ts

@@ -67,7 +67,7 @@ export const trimRef = (ref: string | RefObject): string => getRef(ref).replace(
 
 export const getTag = (ref: string | RefObject): string => isTagRef(ref) ? trimRef(ref) : '';
 
-const saveTarget = (ref: string | RefObject, origin: string): string => isTagRef(ref) ? 'tags' : isPrRef(ref) ? 'pull' : origin;
+const saveTarget = (ref: string | RefObject, origin: string): string => isTagRef(ref) ? 'tags' : isPrRef(ref) ? `${origin}/pull` : origin;
 
 // e.g.
 //  refs/heads/master
@@ -77,7 +77,7 @@ export const getRemoteRefspec = (ref: string | RefObject): string => normalizeRe
 
 // e.g.
 //  origin/master
-//  pull/123/merge
+//  origin/pull/123/merge
 //  tags/v1.2.3
 export const getLocalRefspec = (ref: string | RefObject, origin = 'origin'): string => `${saveTarget(ref, origin)}/${trimRef(ref)}`;