diff --git a/Makefile b/Makefile index 473b2e9..ae404e6 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ msg := "" IMAGE_NAME := actions_hugo_dev:latest NODE_VERSION := $(shell cat ./.nvmrc) DOCKER_BUILD := docker build . -t $(IMAGE_NAME) --build-arg NODE_VERSION=$(NODE_VERSION) -DOCKER_RUN := docker run --rm -i -t -v ${PWD}:/repo -v ~/.gitconfig:/etc/gitconfig $(IMAGE_NAME) +DOCKER_RUN := docker run --rm -i -t -v ${PWD}:/repo -v ~/.gitconfig:/root/.gitconfig $(IMAGE_NAME) .PHONY: build diff --git a/src/index.ts b/src/index.ts index c14e8f1..9b3ca7c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,8 @@ +import * as core from '@actions/core'; import * as main from './main'; -main.run(); +try { + main.run(); +} catch (e) { + core.setFailed(`Action failed with error ${e}`); +} diff --git a/src/main.ts b/src/main.ts index 3504783..7784223 100644 --- a/src/main.ts +++ b/src/main.ts @@ -34,28 +34,23 @@ export async function showVersion( } export async function run(): Promise { - try { - const toolVersion: string = core.getInput('hugo-version'); - let installVersion = ''; + const toolVersion: string = core.getInput('hugo-version'); + let installVersion = ''; - let result: ActionResult = { - exitcode: 0, - output: '' - }; + let result: ActionResult = { + exitcode: 0, + output: '' + }; - if (toolVersion === '' || toolVersion === 'latest') { - installVersion = await getLatestVersion(Tool.Org, Tool.Repo, 'brew'); - } else { - installVersion = toolVersion; - } - - core.info(`${Tool.Name} version: ${installVersion}`); - await installer(installVersion); - result = await showVersion(Tool.CmdName, [Tool.CmdOptVersion]); - - return result; - } catch (e) { - core.setFailed(`Action failed with error ${e}`); - throw e; + if (toolVersion === '' || toolVersion === 'latest') { + installVersion = await getLatestVersion(Tool.Org, Tool.Repo, 'brew'); + } else { + installVersion = toolVersion; } + + core.info(`${Tool.Name} version: ${installVersion}`); + await installer(installVersion); + result = await showVersion(Tool.CmdName, [Tool.CmdOptVersion]); + + return result; }