Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix repack_juggler script (#10864)

Browse source 
- The script should show a sensible error if there's no browser build to
  download
- Fix download URLs for mac arm builds
This commit is contained in:
Andrey Lushnikov 2021-12-10 11:45:43 -08:00 committed by GitHub
parent 0b120c7f03
commit 9e732f7b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
browser_patches/repack-juggler.mjs
View file

@ -76,7 +76,7 @@ const DOWNLOAD_URLS = {
'mac10.14': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.zip', 'mac10.14': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.zip',
'mac10.15': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.zip', 'mac10.15': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.zip',
'mac11': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.zip', 'mac11': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.zip',
'mac11-arm64': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11.0-arm64.zip', 'mac11-arm64': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-mac-11-arm64.zip',
'win64': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-win64.zip', 'win64': 'https://playwright.azureedge.net/builds/firefox/%s/firefox-win64.zip',
}, },
'firefox-beta': { 'firefox-beta': {
@ -85,7 +85,7 @@ const DOWNLOAD_URLS = {
'mac10.14': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.zip', 'mac10.14': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.zip',
'mac10.15': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.zip', 'mac10.15': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.zip',
'mac11': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.zip', 'mac11': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.zip',
'mac11-arm64': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11.0-arm64.zip', 'mac11-arm64': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
'win64': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-win64.zip', 'win64': 'https://playwright.azureedge.net/builds/firefox-beta/%s/firefox-beta-win64.zip',
}, },
}; };
@ -193,29 +193,29 @@ function httpRequest(url, method, response) {
} }
function downloadFile(url, destinationPath, progressCallback) { function downloadFile(url, destinationPath, progressCallback) {
let fulfill = ({ error }) => {};
let downloadedBytes = 0; let downloadedBytes = 0;
let totalBytes = 0; let totalBytes = 0;
const promise = new Promise(x => { fulfill = x; }); let fulfill, reject;
const promise = new Promise((x, y) => { fulfill = x; reject = y; });
const request = httpRequest(url, 'GET', response => { const request = httpRequest(url, 'GET', response => {
if (response.statusCode !== 200) { if (response.statusCode !== 200) {
const error = new Error(`Download failed: server returned code ${response.statusCode}. URL: ${url}`); const error = new Error(`Download failed: server returned code ${response.statusCode}. URL: ${url}`);
// consume response data to free up memory // consume response data to free up memory
response.resume(); response.resume();
fulfill({ error }); reject(error);
return; return;
} }
const file = fs.createWriteStream(destinationPath); const file = fs.createWriteStream(destinationPath);
file.on('finish', () => fulfill({ error: null })); file.on('finish', () => fulfill());
file.on('error', error => fulfill({ error })); file.on('error', error => reject(error));
response.pipe(file); response.pipe(file);
totalBytes = parseInt(response.headers['content-length'], 10); totalBytes = parseInt(response.headers['content-length'], 10);
if (progressCallback) if (progressCallback)
response.on('data', onData); response.on('data', onData);
}); });
request.on('error', error => fulfill({ error })); request.on('error', error => reject(error));
return promise; return promise;
function onData(chunk) { function onData(chunk) {
@ -315,7 +315,10 @@ function getHostPlatform() {
} }
async function main() { async function main() {
const buildInfo = await ensureFirefoxBuild(browserName, process.argv[3], process.argv[4]); const buildInfo = await ensureFirefoxBuild(browserName, process.argv[3], process.argv[4]).catch(e => {
console.log(e.message);
process.exit(1);
});
await repackageJuggler(browserName, buildInfo); await repackageJuggler(browserName, buildInfo);
} }