Merge pull request #302 from technote-space/release/next-v3.3.1

release: v3.4.0

Author: technote-space

__tests__/git-helper.test.ts

@@ -576,6 +576,45 @@ describe('GitHelper', () => {
     });
   });
 
+  describe('deleteLocalTag', () => {
+    it('should delete tag', async() => {
+      const mockExec = spyOnSpawn();
+
+      await helper.deleteLocalTag(workDir, 'delete-tag');
+
+      execCalledWith(mockExec, [
+        'git tag -d delete-tag || :',
+      ]);
+    });
+
+    it('should run add tags', async() => {
+      const mockExec = spyOnSpawn();
+
+      await helper.deleteLocalTag(workDir, ['delete-tag1', 'delete-tag2']);
+
+      execCalledWith(mockExec, [
+        'git tag -d delete-tag1 delete-tag2 || :',
+      ]);
+    });
+
+    it('should chunk delete tags', async() => {
+      const mockExec = spyOnSpawn();
+
+      await helper.deleteLocalTag(workDir, [
+        'delete-tag1',
+        'delete-tag2',
+        'delete-tag3',
+        'tags/delete-tag4',
+        'refs/tags/delete-tag5',
+      ], 3);
+
+      execCalledWith(mockExec, [
+        'git tag -d delete-tag1 delete-tag2 delete-tag3 || :',
+        'git tag -d delete-tag4 delete-tag5 || :',
+      ]);
+    });
+  });
+
   describe('addLocalTag', () => {
     it('should run add tag', async() => {
       const mockExec = spyOnSpawn();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/github-action-helper",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "description": "Helper for GitHub Action.",
   "author": {
     "name": "Technote",
@@ -26,28 +26,28 @@
     "dist"
   ],
   "dependencies": {
-    "@actions/core": "^1.2.4",
+    "@actions/core": "^1.2.5",
     "@actions/github": "^4.0.0",
-    "@octokit/plugin-rest-endpoint-methods": "^4.1.2",
+    "@octokit/plugin-rest-endpoint-methods": "^4.1.3",
     "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.10",
-    "@types/node": "^14.6.0",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
-    "eslint": "^7.7.0",
+    "@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",
-    "jest": "^26.4.0",
-    "jest-circus": "^26.4.0",
-    "lint-staged": "^10.2.11",
+    "jest": "^26.4.2",
+    "jest-circus": "^26.4.2",
+    "lint-staged": "^10.2.13",
     "nock": "^13.0.4",
-    "ts-jest": "^26.2.0",
-    "typescript": "^3.9.7"
+    "ts-jest": "^26.3.0",
+    "typescript": "^4.0.2"
   },
   "publishConfig": {
     "access": "public"

src/git-helper.ts

@@ -457,24 +457,17 @@ export default class GitHelper {
    * @return {Promise<void>} void
    */
   public deleteTag = async(workDir: string, tags: string | string[], context: Context, splitSize = 20): Promise<void> => { // eslint-disable-line no-magic-numbers
-    const regexp    = /^(refs\/)?tags\//;
-    const getTagRef = (tag: string): string => regexp.test(tag) ? tag : `tags/${tag}`;
-    const getTag    = (tag: string): string => tag.replace(regexp, '');
-    await this.runCommand(workDir, [
-      ...arrayChunk((typeof tags === 'string' ? [tags] : tags).map(getTagRef), splitSize).map(tags => ({
+    const getTagRef = (tag: string): string => /^(refs\/)?tags\//.test(tag) ? tag : `tags/${tag}`;
+    await this.runCommand(workDir,
+      arrayChunk((typeof tags === 'string' ? [tags] : tags).map(getTagRef), splitSize).map(tags => ({
         command: 'git push',
         args: [this.getRemote(context), '--delete', ...tags],
         quiet: this.isQuiet(),
         altCommand: `git push ${this.getRemoteName()} --delete ${tags.join(' ')}`,
         suppressError: true,
       })),
-      ...arrayChunk((typeof tags === 'string' ? [tags] : tags).map(getTag), splitSize).map(tags => ({
-        command: 'git tag',
-        args: ['-d', ...tags],
-        suppressError: true,
-        stderrToStdout: true,
-      })),
-    ]);
+    );
+    await this.deleteLocalTag(workDir, tags, splitSize);
   };
 
   /**
@@ -500,6 +493,24 @@ export default class GitHelper {
     ]);
   };
 
+  /**
+   * @param {string} workDir work dir
+   * @param {string|string[]} tags tags
+   * @param {number} splitSize split size
+   * @return {Promise<void>} void
+   */
+  public deleteLocalTag = async(workDir: string, tags: string | string[], splitSize = 20): Promise<void> => { // eslint-disable-line no-magic-numbers
+    const getTag = (tag: string): string => tag.replace(/^(refs\/)?tags\//, '');
+    await this.runCommand(workDir, arrayChunk((typeof tags === 'string' ? [tags] : tags).map(getTag), splitSize).map(
+      tags => ({
+        command: 'git tag',
+        args: ['-d', ...tags],
+        suppressError: true,
+        stderrToStdout: true,
+      }),
+    ));
+  };
+
   /**
    * @param {string} workDir work dir
    * @param {string|string[]} tags tags