Skip to content

Commit 4647bc8

Browse files
committed
Revert "feat(chromium): download the chromium binary based on a major version (#368)"
This reverts commit 0b8679b.
1 parent 1b04194 commit 4647bc8

File tree

5 files changed

+10
-310
lines changed

5 files changed

+10
-310
lines changed

lib/provider/chromium.spec-int.ts

-24
This file was deleted.

lib/provider/chromium.ts

-278
This file was deleted.

lib/provider/utils/cloud_storage_xml.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
33
import * as semver from 'semver';
4-
import {convertXml2js, isExpired, readXml} from './file_utils';
4+
import {convertXml2js, readXml} from './file_utils';
5+
import {isExpired} from './file_utils';
56
import {HttpOptions, JsonObject, requestBody} from './http_utils';
67
import {VersionList} from './version_list';
78

lib/provider/utils/file_utils.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ export function unzipFile(zipFileName: string, dstDir: string): string[] {
105105
const zip = new AdmZip(zipFileName);
106106
zip.extractAllTo(dstDir, true);
107107
for (const fileItem of zipFileList(zipFileName)) {
108-
console.log(fileItem);
109108
fileList.push(path.resolve(dstDir, fileItem));
110109
}
111110
return fileList;
@@ -116,16 +115,18 @@ export function unzipFile(zipFileName: string, dstDir: string): string[] {
116115
* @param tarball The tarball file.
117116
* @returns A lsit of files in the tarball file.
118117
*/
119-
export async function tarFileList(tarball: string): Promise<string[]> {
118+
export function tarFileList(tarball: string): Promise<string[]> {
120119
const fileList: string[] = [];
121-
await tar
120+
return tar
122121
.list({
123122
file: tarball,
124123
onentry: entry => {
125124
fileList.push(entry['path'].toString());
126125
}
127-
});
128-
return fileList;
126+
})
127+
.then(() => {
128+
return fileList;
129+
});
129130
}
130131

131132
/**
@@ -182,7 +183,7 @@ export function generateConfigFile(
182183
configData['last'] = lastFileBinaryPath;
183184
}
184185
configData['all'] = getMatchingFiles(outDir, fileBinaryPathRegex);
185-
fs.writeFileSync(fileName, JSON.stringify(configData, null, 2));
186+
fs.writeFileSync(fileName, JSON.stringify(configData));
186187
}
187188

188189
/**

spec/jasmine-int.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"spec_dir": "dist",
33
"spec_files": [
4-
"**/chromium.spec-int.js"
4+
"**/*.spec-int.js"
55
],
66
"stopSpecOnExpectationFailure": false,
77
"random": false

0 commit comments

Comments
 (0)