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

chore: reformat and get rid of deprecates in repack-juggler script (#10582)

Browse source
This commit is contained in:
Max Schmitt 2021-11-29 17:42:19 +01:00 committed by GitHub
parent 63abf0950b
commit 1a6d59311d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
browser_patches/repack-juggler.mjs
View file

@ -1,4 +1,19 @@
#!/usr/bin/env node #!/usr/bin/env node
/**
* Copyright (c) Microsoft Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import * as path from 'path'; import * as path from 'path';
import * as URL from 'url'; import * as URL from 'url';
@ -84,7 +99,7 @@ async function ensureFirefoxBuild(browserName, buildNumber, buildPlatform) {
if (currentBuildInfo.buildPlatform === buildPlatform && currentBuildInfo.buildNumber === buildNumber && currentBuildInfo.browserName === browserName) if (currentBuildInfo.buildPlatform === buildPlatform && currentBuildInfo.buildNumber === buildNumber && currentBuildInfo.browserName === browserName)
return currentBuildInfo; return currentBuildInfo;
await fs.promises.rmdir(BUILD_DIRECTORY, { recursive: true }).catch(e => {}); await fs.promises.rm(BUILD_DIRECTORY, { recursive: true }).catch(e => {});
await fs.promises.mkdir(BUILD_DIRECTORY); await fs.promises.mkdir(BUILD_DIRECTORY);
const buildZipPath = path.join(BUILD_DIRECTORY, 'firefox.zip'); const buildZipPath = path.join(BUILD_DIRECTORY, 'firefox.zip');
@ -127,12 +142,12 @@ async function repackageJuggler(browserName, buildInfo) {
} }
// Let's repackage omni folder! // Let's repackage omni folder!
await fs.promises.rmdir(OMNI_EXTRACT_DIR, { recursive: true }).catch(e => {}); await fs.promises.rm(OMNI_EXTRACT_DIR, { recursive: true }).catch(e => {});
await fs.promises.mkdir(OMNI_EXTRACT_DIR); await fs.promises.mkdir(OMNI_EXTRACT_DIR);
await spawnAsync('unzip', [OMNI_BACKUP_PATH], { cwd: OMNI_EXTRACT_DIR }); await spawnAsync('unzip', [OMNI_BACKUP_PATH], { cwd: OMNI_EXTRACT_DIR });
// Remove current juggler directory // Remove current juggler directory
await fs.promises.rmdir(OMNI_JUGGLER_DIR, { recursive: true }); await fs.promises.rm(OMNI_JUGGLER_DIR, { recursive: true });
// Repopulate with tip-of-tree juggler files // Repopulate with tip-of-tree juggler files
const jarmn = await fs.promises.readFile(JARMN_PATH, 'utf8'); const jarmn = await fs.promises.readFile(JARMN_PATH, 'utf8');
const jarLines = jarmn.split('\n').map(line => line.trim()).filter(line => line.startsWith('content/') && line.endsWith(')')); const jarLines = jarmn.split('\n').map(line => line.trim()).filter(line => line.startsWith('content/') && line.endsWith(')'));
@ -161,7 +176,7 @@ async function repackageJuggler(browserName, buildInfo) {
function httpRequest(url, method, response) { function httpRequest(url, method, response) {
let options = URL.parse(url); const options = URL.parse(url);
options.method = method; options.method = method;
const requestCallback = res => { const requestCallback = res => {
@ -237,8 +252,7 @@ function getUbuntuVersionSync() {
if (!osReleaseText) if (!osReleaseText)
return ''; return '';
return getUbuntuVersionInternal(osReleaseText); return getUbuntuVersionInternal(osReleaseText);
} } catch (e) {
catch (e) {
return ''; return '';
} }
} }