From 050bbfb2117d8a06c6e1f067dd62f8eb24ecba24 Mon Sep 17 00:00:00 2001 From: "trop[bot]" Date: Tue, 4 Jun 2019 10:29:37 -0400 Subject: [PATCH] build: move Windows release builds to AppVeyor cloud (#18604) * build: move Windows release builds to AppVeyor cloud * Use new env variable for AppVeyor cloud server --- .env.example | 2 +- script/ci-release-build.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index cd1561027..eb3df4b6b 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 eae38308a..c156358c0 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 = [ @@ -100,13 +100,13 @@ 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' }, 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}`) }