From 4b143758874dd11ba8e4d435ba3c0cbd730f06fe Mon Sep 17 00:00:00 2001 From: peaceiris <30958501+peaceiris@users.noreply.github.com> Date: Mon, 16 Sep 2019 08:04:23 +0900 Subject: [PATCH] remove: reject --- get-latest-version.js | 7 ++-- index.js | 80 +++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/get-latest-version.js b/get-latest-version.js index 32a0903..4e88138 100644 --- a/get-latest-version.js +++ b/get-latest-version.js @@ -1,7 +1,8 @@ const XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; function getLatestVersion() { - return new Promise((resolve, reject) => { + // return new Promise((resolve, reject) => { + return new Promise(resolve => { const xhr = new XMLHttpRequest(); const url = "https://api.github.com/repos/gohugoio/hugo/releases/latest"; xhr.open("GET", url); @@ -14,8 +15,8 @@ function getLatestVersion() { const latestVersion = latestURL.match(/(\d+).(\d+).(\d+)/g)[0]; resolve(latestVersion); - } else { - reject(`ERROR: got status ${xhr.status}`); + // } else { + // reject(`ERROR: got status ${xhr.status}`); } }; }); diff --git a/index.js b/index.js index 02b598b..27b7057 100644 --- a/index.js +++ b/index.js @@ -6,48 +6,46 @@ const getLatestVersion = require("./get-latest-version"); // most @actions toolkit packages have async methods async function run() { try { - getLatestVersion().then( - async function(latestVersion) { - let hugoVersion = core.getInput("hugo-version"); - if (!hugoVersion || hugoVersion === "latest") { - hugoVersion = latestVersion; - } - core.debug(`Hugo version: ${hugoVersion}`); - - let extended = core.getInput("extended"); - core.debug(`Hugo extended: ${extended}`); - - let extendedStr = ""; - if (extended === "true") { - extendedStr = "extended_"; - } - - console.log(`Operating System: ${process.platform}`); - - const hugoName = `hugo_${extendedStr}${hugoVersion}_Linux-64bit`; - core.debug(`hugoName: ${hugoName}`); - - const hugoURL = `https://github.com/gohugoio/hugo/releases/download/v${hugoVersion}/${hugoName}.tar.gz`; - core.debug(`hugoURL: ${hugoURL}`); - - const hugoPath = "/home/runner/bin"; - await io.mkdirP(hugoPath); - core.addPath(hugoPath); - - // Download and extract Hugo binary - const hugoTarball = await tc.downloadTool(hugoURL); - const hugoExtractedFolder = await tc.extractTar(hugoTarball, "/tmp"); - core.debug("hugoExtractedFolder:", hugoExtractedFolder); - await io.mv(`${hugoExtractedFolder}/hugo`, hugoPath); - }, - function(error) { - console.error(error); - console.log( - "HINT: GitHub API Rate limiting", - "https://developer.github.com/v3/#rate-limiting" - ); + getLatestVersion().then(async function(latestVersion) { + let hugoVersion = core.getInput("hugo-version"); + if (!hugoVersion || hugoVersion === "latest") { + hugoVersion = latestVersion; } - ); + core.debug(`Hugo version: ${hugoVersion}`); + + let extended = core.getInput("extended"); + core.debug(`Hugo extended: ${extended}`); + + let extendedStr = ""; + if (extended === "true") { + extendedStr = "extended_"; + } + + console.log(`Operating System: ${process.platform}`); + + const hugoName = `hugo_${extendedStr}${hugoVersion}_Linux-64bit`; + core.debug(`hugoName: ${hugoName}`); + + const hugoURL = `https://github.com/gohugoio/hugo/releases/download/v${hugoVersion}/${hugoName}.tar.gz`; + core.debug(`hugoURL: ${hugoURL}`); + + const hugoPath = "/home/runner/bin"; + await io.mkdirP(hugoPath); + core.addPath(hugoPath); + + // Download and extract Hugo binary + const hugoTarball = await tc.downloadTool(hugoURL); + const hugoExtractedFolder = await tc.extractTar(hugoTarball, "/tmp"); + core.debug("hugoExtractedFolder:", hugoExtractedFolder); + await io.mv(`${hugoExtractedFolder}/hugo`, hugoPath); + // }, + // function(error) { + // console.error(error); + // console.log( + // "HINT: GitHub API Rate limiting", + // "https://developer.github.com/v3/#rate-limiting" + // ); + }); } catch (error) { core.setFailed(error.message); }