test: fix

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -6,7 +6,6 @@ updates:
     interval: daily
     time: '11:00'
     timezone: Japan
-  open-pull-requests-limit: 1
   labels:
   - "dependencies"
   ignore:

.github/label-commenter-config.yml

@@ -9,7 +9,7 @@ labels:
       issue:
         body: |
           Please ask questions about GitHub Actions or Hugo at the following forum.
-          - [GitHub Actions Community Forum](https://github.community/t5/GitHub-Actions/bd-p/actions)
+          - [GitHub Actions Community Forum](https://github.community/c/github-actions)
           - [Hugo Community Forum](https://discourse.gohugo.io/)
         action: close
   - name: wontfix

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,29 @@
+name: "Code Scanning"
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  CodeQL-Build:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - run: git checkout HEAD^2
+        if: ${{ github.event_name == 'pull_request' }}
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: javascript
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/dev-image.yml

@@ -3,7 +3,7 @@ name: 'Dev Image CI'
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - '.github/workflows/dev-image.yml'
       - '.dockerignore'

.github/workflows/label-commenter.yml

@@ -16,10 +16,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: master
+          ref: main
 
       - name: Label Commenter
-        uses: peaceiris/actions-label-commenter@v1
+        uses: peaceiris/actions-label-commenter@v1.3.7
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           # config_file: .github/label-commenter-config.yml

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: 'Test'
 on:
   push:
     branches:
-      - master
+      - main
     paths-ignore:
       - '**.md'
   pull_request:
@@ -29,7 +29,7 @@ jobs:
         id: nvm
 
       - name: Setup Node
-        uses: actions/setup-node@v2.0.0
+        uses: actions/setup-node@v2.1.0
         with:
           node-version: '${{ steps.nvm.outputs.NVMRC }}'
 
@@ -56,6 +56,6 @@ jobs:
           name: coverage-${{ matrix.os }}
           path: coverage
 
-      - uses: codecov/codecov-action@v1.0.7
+      - uses: codecov/codecov-action@v1.0.10
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.nvmrc

@@ -1 +1 @@
-12.18.1
+12.18.2

.prettierrc.json

@@ -1,11 +1,11 @@
 {
-    "printWidth": 80,
+  "printWidth": 100,
-    "tabWidth": 2,
+  "tabWidth": 2,
-    "useTabs": false,
+  "useTabs": false,
-    "semi": true,
+  "semi": true,
-    "singleQuote": true,
+  "singleQuote": true,
-    "trailingComma": "none",
+  "trailingComma": "none",
-    "bracketSpacing": false,
+  "bracketSpacing": false,
-    "arrowParens": "avoid",
+  "arrowParens": "avoid",
-    "parser": "typescript"
+  "parser": "typescript"
-  }
+}

README.md

@@ -1,11 +1,11 @@
-[![license](https://img.shields.io/github/license/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/blob/master/LICENSE)
+[![license](https://img.shields.io/github/license/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/blob/main/LICENSE)
 [![release](https://img.shields.io/github/release/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/releases/latest)
 [![GitHub release date](https://img.shields.io/github/release-date/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/releases)
 [![Release Feed](https://img.shields.io/badge/release-feed-yellow)](https://github.com/peaceiris/actions-hugo/releases.atom)
-![Test](https://github.com/peaceiris/actions-hugo/workflows/Test/badge.svg?branch=master&event=push)
+![Test](https://github.com/peaceiris/actions-hugo/workflows/Test/badge.svg?branch=main&event=push)
 
 [![CodeFactor](https://www.codefactor.io/repository/github/peaceiris/actions-hugo/badge)](https://www.codefactor.io/repository/github/peaceiris/actions-hugo)
-[![codecov](https://codecov.io/gh/peaceiris/actions-hugo/branch/master/graph/badge.svg)](https://codecov.io/gh/peaceiris/actions-hugo)
+[![codecov](https://codecov.io/gh/peaceiris/actions-hugo/branch/main/graph/badge.svg)](https://codecov.io/gh/peaceiris/actions-hugo)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ebf2eef3a046b396ba9c/maintainability)](https://codeclimate.com/github/peaceiris/actions-hugo/maintainability)
 
 <img width="400" alt="GitHub Actions for Hugo" src="./images/ogp.svg">
@@ -75,7 +75,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -89,7 +89,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.71.1'
+          hugo-version: '0.74.1'
           # extended: true
 
       - name: Build
@@ -118,7 +118,7 @@ Set `extended: true` to use a Hugo extended version.
 - name: Setup Hugo
   uses: peaceiris/actions-hugo@v2
   with:
-    hugo-version: '0.71.1'
+    hugo-version: '0.74.1'
     extended: true
 ```
 
@@ -150,7 +150,7 @@ How to sync a Hugo version between a Docker Compose and a GitHub Actions workflo
 Write a `HUGO_VERSION` to the `.env` file like the following and push it to a remote branch.
 
 ```sh
-HUGO_VERSION=0.71.1
+HUGO_VERSION=0.74.1
 ```
 
 Next, add a step to read a Hugo version from the `.env` file.
@@ -210,7 +210,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -224,7 +224,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.71.1'
+          hugo-version: '0.74.1'
           extended: true
 
       - name: Setup Node
@@ -259,7 +259,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -273,7 +273,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.71.1'
+          hugo-version: '0.74.1'
           extended: true
 
       - name: Setup Ruby
@@ -310,7 +310,7 @@ jobs:
 
 - [MIT License - peaceiris/actions-hugo]
 
-[MIT License - peaceiris/actions-hugo]: https://github.com/peaceiris/actions-hugo/blob/master/LICENSE
+[MIT License - peaceiris/actions-hugo]: https://github.com/peaceiris/actions-hugo/blob/main/LICENSE
 
 
 

__tests__/get-latest-version.test.ts

@@ -27,15 +27,9 @@ describe('getURL()', () => {
 
 describe('getLatestVersion()', () => {
   test('return latest version via brew', async () => {
-    nock('https://formulae.brew.sh')
+    nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew);
-      .get(`/api/formula/${Tool.Repo}.json`)
-      .reply(200, jsonTestBrew);
 
-    const versionLatest: string = await getLatestVersion(
+    const versionLatest: string = await getLatestVersion(Tool.Org, Tool.Repo, 'brew');
-      Tool.Org,
-      Tool.Repo,
-      'brew'
-    );
     expect(versionLatest).toMatch(Tool.TestVersionLatest);
   });
 
@@ -44,21 +38,13 @@ describe('getLatestVersion()', () => {
       .get(`/repos/${Tool.Org}/${Tool.Repo}/releases/latest`)
       .reply(200, jsonTestGithub);
 
-    const versionLatest: string = await getLatestVersion(
+    const versionLatest: string = await getLatestVersion(Tool.Org, Tool.Repo, 'github');
-      Tool.Org,
-      Tool.Repo,
-      'github'
-    );
     expect(versionLatest).toMatch(Tool.TestVersionLatest);
   });
 
   test('return exception 404', async () => {
-    nock('https://formulae.brew.sh')
+    nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(404);
-      .get(`/api/formula/${Tool.Repo}.json`)
-      .reply(404);
 
-    await expect(
+    await expect(getLatestVersion(Tool.Org, Tool.Repo, 'brew')).rejects.toThrowError(FetchError);
-      getLatestVersion(Tool.Org, Tool.Repo, 'brew')
-    ).rejects.toThrowError(FetchError);
   });
 });

__tests__/get-url.test.ts

@@ -2,8 +2,7 @@ import getURL from '../src/get-url';
 
 describe('getURL()', () => {
   test('test', () => {
-    const baseURL =
+    const baseURL = 'https://github.com/gohugoio/hugo/releases/download/v0.58.2';
-      'https://github.com/gohugoio/hugo/releases/download/v0.58.2';
     const urlLinux = `${baseURL}/hugo_0.58.2_Linux-64bit.tar.gz`;
     const urlLinuxExtended = `${baseURL}/hugo_extended_0.58.2_Linux-64bit.tar.gz`;
     const urlMacOS = `${baseURL}/hugo_0.58.2_macOS-64bit.tar.gz`;

__tests__/main.test.ts

@@ -25,6 +25,7 @@ describe('Integration testing run()', () => {
   test('succeed in installing a custom version', async () => {
     const testVersion = Tool.TestVersionSpec;
     process.env['INPUT_HUGO-VERSION'] = testVersion;
+    process.env['INPUT_EXTENDED'] = 'false';
     const result: main.ActionResult = await main.run();
     expect(result.exitcode).toBe(0);
     expect(result.output).toMatch(`Hugo Static Site Generator v${testVersion}`);
@@ -43,37 +44,28 @@ describe('Integration testing run()', () => {
   test('succeed in installing the latest version', async () => {
     const testVersion = 'latest';
     process.env['INPUT_HUGO-VERSION'] = testVersion;
-    nock('https://formulae.brew.sh')
+    process.env['INPUT_EXTENDED'] = 'false';
-      .get(`/api/formula/${Tool.Repo}.json`)
+    nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew);
-      .reply(200, jsonTestBrew);
     const result: main.ActionResult = await main.run();
     expect(result.exitcode).toBe(0);
-    expect(result.output).toMatch(
+    expect(result.output).toMatch(`Hugo Static Site Generator v${Tool.TestVersionLatest}`);
-      `Hugo Static Site Generator v${Tool.TestVersionLatest}`
-    );
   });
 
   test('succeed in installing the latest extended version', async () => {
     const testVersion = 'latest';
     process.env['INPUT_HUGO-VERSION'] = testVersion;
     process.env['INPUT_EXTENDED'] = 'true';
-    nock('https://formulae.brew.sh')
+    nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew);
-      .get(`/api/formula/${Tool.Repo}.json`)
-      .reply(200, jsonTestBrew);
     const result: main.ActionResult = await main.run();
     expect(result.exitcode).toBe(0);
-    expect(result.output).toMatch(
+    expect(result.output).toMatch(`Hugo Static Site Generator v${Tool.TestVersionLatest}`);
-      `Hugo Static Site Generator v${Tool.TestVersionLatest}`
-    );
     expect(result.output).toMatch(`extended`);
   });
 
   test('fail to install the latest version due to 404 of brew', async () => {
     process.env['INPUT_HUGO-VERSION'] = 'latest';
-    nock('https://formulae.brew.sh')
+    process.env['INPUT_EXTENDED'] = 'false';
-      .get(`/api/formula/${Tool.Repo}.json`)
+    nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(404);
-      .reply(404);
-
     await expect(main.run()).rejects.toThrowError(FetchError);
   });
 });
@@ -91,8 +83,6 @@ describe('showVersion()', () => {
   });
 
   test('return not found', async () => {
-    await expect(
+    await expect(main.showVersion('gitgit', ['--version'])).rejects.toThrowError(Error);
-      main.showVersion('gitgit', ['--version'])
-    ).rejects.toThrowError(Error);
   });
 });

package.json

@@ -27,7 +27,7 @@
     }
   },
   "lint-staged": {
-    "src/**/*.ts": [
+    "{src,__tests__}/**/*.ts": [
       "prettier --check",
       "eslint"
     ],
@@ -57,26 +57,26 @@
     "@actions/core": "^1.2.4",
     "@actions/exec": "^1.0.4",
     "@actions/io": "^1.0.2",
-    "@actions/tool-cache": "^1.5.5",
+    "@actions/tool-cache": "^1.6.0",
     "node-fetch": "^2.6.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.0",
+    "@types/jest": "^26.0.4",
     "@types/node": "~12",
     "@types/node-fetch": "^2.5.7",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
     "@zeit/ncc": "^0.22.3",
     "eslint": "^6.8.0",
-    "eslint-plugin-jest": "^23.13.2",
+    "eslint-plugin-jest": "^23.18.0",
     "husky": "^4.2.5",
     "jest": "^25.5.4",
-    "jest-circus": "^26.0.1",
+    "jest-circus": "^26.1.0",
     "lint-staged": "^10.2.11",
-    "nock": "^12.0.3",
+    "nock": "^13.0.2",
     "prettier": "2.0.5",
-    "standard-version": "^8.0.0",
+    "standard-version": "^8.0.2",
     "ts-jest": "^25.5.1",
-    "typescript": "^3.9.5"
+    "typescript": "^3.9.7"
   }
 }

release.sh

@@ -3,8 +3,10 @@
 # fail on unset variables and command errors
 set -eu -o pipefail # -x: is for debugging
 
-if [ "$(git branch --show-current)" != "master" ]; then
+DEFAULT_BRANCH="main"
-  echo "$0: Current branch is not master" 1>&2
+
+if [ "$(git branch --show-current)" != "${DEFAULT_BRANCH}" ]; then
+  echo "$0: Current branch is not ${DEFAULT_BRANCH}" 1>&2
   exit 1
 fi
 
@@ -26,7 +28,7 @@ if [ "${res}" = "n" ]; then
 fi
 
 git fetch origin
-git pull origin master
+git pull origin "${DEFAULT_BRANCH}"
 git tag -d v2 || true
 git pull origin --tags
 
@@ -44,5 +46,5 @@ rm -rf ./lib
 git commit -m "chore(release): Remove build assets [skip ci]"
 
 TAG_NAME="v$(jq -r '.version' ./package.json)"
-git push origin master
+git push origin "${DEFAULT_BRANCH}"
 git push origin "${TAG_NAME}"

src/get-latest-version.ts

@@ -12,11 +12,7 @@ export function getURL(org: string, repo: string, api: string): string {
   return url;
 }
 
-export async function getLatestVersion(
+export async function getLatestVersion(org: string, repo: string, api: string): Promise<string> {
-  org: string,
-  repo: string,
-  api: string
-): Promise<string> {
   const url = getURL(org, repo, api);
   const response = await fetch(url);
   const json = await response.json();

src/get-url.ts

@@ -1,15 +1,11 @@
-export default function getURL(
+export default function getURL(os: string, extended: string, version: string): string {
-  os: string,
-  extended: string,
-  version: string
-): string {
   const extendedStr = (extended: string): string => {
     if (extended === 'true') {
       return 'extended_';
-    } else {
+    } else if (extended === 'false') {
       return '';
-      // } else {
+    } else {
-      //   throw new Error(`Invalid input (extended): ${extended}`);
+      throw new Error(`Invalid input (extended): ${extended}`);
     }
   };
 

src/installer.ts

@@ -59,16 +59,10 @@ export async function installer(version: string): Promise<void> {
   const toolAssets: string = await tc.downloadTool(toolURL);
   let toolBin = '';
   if (process.platform === 'win32') {
-    const toolExtractedFolder: string = await tc.extractZip(
+    const toolExtractedFolder: string = await tc.extractZip(toolAssets, tempDir);
-      toolAssets,
-      tempDir
-    );
     toolBin = `${toolExtractedFolder}/${Tool.CmdName}.exe`;
   } else {
-    const toolExtractedFolder: string = await tc.extractTar(
+    const toolExtractedFolder: string = await tc.extractTar(toolAssets, tempDir);
-      toolAssets,
-      tempDir
-    );
     toolBin = `${toolExtractedFolder}/${Tool.CmdName}`;
   }
   await io.mv(toolBin, binDir);

src/main.ts

@@ -9,10 +9,7 @@ export interface ActionResult {
   output: string;
 }
 
-export async function showVersion(
+export async function showVersion(cmd: string, args: string[]): Promise<ActionResult> {
-  cmd: string,
-  args: string[]
-): Promise<ActionResult> {
   const result: ActionResult = {
     exitcode: 0,
     output: ''