mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ci: fix issues downloading from CircleCI (#18652)

Browse source 
Make sure we pass along token to download from CircleCI
Also, add back off period for retries on downloads.
This commit is contained in:
John Kleinschmidt 2019-06-05 12:21:57 -04:00 committed by GitHub
parent 796d2636e6
commit bd80e68698
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
script/download-circleci-artifacts.js
View file

@ -13,6 +13,7 @@ async function makeRequest (requestOptions, parseResponse) {
resolve(body) resolve(body)
} }
} else { } else {
if (args.verbose) {
console.error('Error occurred while requesting:', requestOptions.url) console.error('Error occurred while requesting:', requestOptions.url)
if (parseResponse) { if (parseResponse) {
try { try {
@ -23,6 +24,7 @@ async function makeRequest (requestOptions, parseResponse) {
} else { } else {
console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions) console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
} }
}
reject(err) reject(err)
} }
}) })
@ -39,7 +41,11 @@ async function downloadArtifact (name, buildNum, dest) {
'Accept': 'application/json' 'Accept': 'application/json'
} }
}, true).catch(err => { }, true).catch(err => {
if (args.verbose) {
console.log('Error calling CircleCI:', err) console.log('Error calling CircleCI:', err)
} else {
console.error('Error calling CircleCI to get artifact details')
}
}) })
const artifactToDownload = artifacts.find(artifact => { const artifactToDownload = artifacts.find(artifact => {
return (artifact.path === name) return (artifact.path === name)
@ -51,7 +57,11 @@ async function downloadArtifact (name, buildNum, dest) {
console.log(`Downloading ${artifactToDownload.url}.`) console.log(`Downloading ${artifactToDownload.url}.`)
let downloadError = false let downloadError = false
await downloadWithRetry(artifactToDownload.url, dest).catch(err => { await downloadWithRetry(artifactToDownload.url, dest).catch(err => {
console.log(`Error downnloading ${artifactToDownload.url} :`, err) if (args.verbose) {
console.log(`${artifactToDownload.url} could not be successfully downloaded. Error was:`, err)
} else {
console.log(`${artifactToDownload.url} could not be successfully downloaded.`)
}
downloadError = true downloadError = true
}) })
if (!downloadError) { if (!downloadError) {
@ -62,12 +72,14 @@ async function downloadArtifact (name, buildNum, dest) {
async function downloadWithRetry (url, directory) { async function downloadWithRetry (url, directory) {
let lastError let lastError
const downloadURL = `${url}?circle-token=${process.env.CIRCLE_TOKEN}`
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
console.log(`Attempting to download ${url} - attempt #${(i + 1)}`) console.log(`Attempting to download ${url} - attempt #${(i + 1)}`)
try { try {
return await downloadFile(url, directory) return await downloadFile(downloadURL, directory)
} catch (err) { } catch (err) {
lastError = err lastError = err
await new Promise((resolve, reject) => setTimeout(resolve, 30000))
} }
} }
throw lastError throw lastError
@ -76,7 +88,8 @@ async function downloadWithRetry (url, directory) {
function downloadFile (url, directory) { function downloadFile (url, directory) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const nuggetOpts = { const nuggetOpts = {
dir: directory dir: directory,
quiet: args.verbose
} }
nugget(url, nuggetOpts, (err) => { nugget(url, nuggetOpts, (err) => {
if (err) { if (err) {
@ -90,7 +103,7 @@ function downloadFile (url, directory) {
if (!args.name || !args.buildNum || !args.dest) { if (!args.name || !args.buildNum || !args.dest) {
console.log(`Download CircleCI artifacts. console.log(`Download CircleCI artifacts.
Usage: download-circleci-artifacts.js [--buildNum=CIRCLE_BUILD_NUMBER] [--name=artifactName] [--dest]`) Usage: download-circleci-artifacts.js [--buildNum=CIRCLE_BUILD_NUMBER] [--name=artifactName] [--dest] [--verbose]`)
process.exit(0) process.exit(0)
} else { } else {
downloadArtifact(args.name, args.buildNum, args.dest) downloadArtifact(args.name, args.buildNum, args.dest)