From 5a0a355a26345dd7d3e8ba906d6ee9187ea59bf0 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Fri, 17 May 2019 10:27:39 -0400 Subject: [PATCH 1/2] build: move Windows release builds to AppVeyor cloud --- script/ci-release-build.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/ci-release-build.js b/script/ci-release-build.js index eae38308a3185..2367ec3b24cea 100644 --- a/script/ci-release-build.js +++ b/script/ci-release-build.js @@ -2,12 +2,12 @@ if (!process.env.CI) require('dotenv-safe').load() const assert = require('assert') const request = require('request') -const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds' +const buildAppVeyorURL = 'https://ci.appveyor.com/api/builds' const vstsURL = 'https://github.visualstudio.com/electron/_apis/build' const appVeyorJobs = { - 'electron-x64': 'electron', - 'electron-ia32': 'electron-39ng6' + 'electron-x64': 'electron-x64-release', + 'electron-ia32': 'electron-ia32-release' } const circleCIJobs = [ @@ -106,7 +106,7 @@ async function callAppVeyor (targetBranch, job, options) { 'Content-Type': 'application/json' }, body: JSON.stringify({ - accountName: 'AppVeyor', + accountName: 'electron-bot', projectSlug: appVeyorJobs[job], branch: targetBranch, environmentVariables @@ -116,7 +116,7 @@ async function callAppVeyor (targetBranch, job, options) { const appVeyorResponse = await makeRequest(requestOpts, true).catch(err => { console.log('Error calling AppVeyor:', err) }) - const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/${appVeyorJobs[job]}/build/${appVeyorResponse.version}` + const buildUrl = `https://ci.appveyor.com/project/electron-bot/${appVeyorJobs[job]}/build/${appVeyorResponse.version}` console.log(`AppVeyor release build request for ${job} successful. Check build status at ${buildUrl}`) } From ca712150a396021bdf04c40cce230d6e11a4ddd0 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 21 May 2019 11:28:08 -0400 Subject: [PATCH 2/2] Use new env variable for AppVeyor cloud server --- .env.example | 2 +- script/ci-release-build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index cd15610276869..eb3df4b6bdf9c 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ # These env vars are only necessary for creating Electron releases. # See docs/development/releasing.md -APPVEYOR_TOKEN= +APPVEYOR_CLOUD_TOKEN= CIRCLE_TOKEN= ELECTRON_GITHUB_TOKEN= VSTS_TOKEN= \ No newline at end of file diff --git a/script/ci-release-build.js b/script/ci-release-build.js index 2367ec3b24cea..c156358c09779 100644 --- a/script/ci-release-build.js +++ b/script/ci-release-build.js @@ -100,7 +100,7 @@ async function callAppVeyor (targetBranch, job, options) { const requestOpts = { url: buildAppVeyorURL, auth: { - bearer: process.env.APPVEYOR_TOKEN + bearer: process.env.APPVEYOR_CLOUD_TOKEN }, headers: { 'Content-Type': 'application/json'