Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(manager/electron): replace turned down OmahaProxy with ChromiumDash #1462

Merged
merged 5 commits into from
Dec 11, 2023
Merged

fix(manager/electron): replace turned down OmahaProxy with ChromiumDash #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b90f63
fix(server_manager): replace turned down omahaproxy.appspot.com
sbruens Dec 11, 2023
dd75c1a
Update engine.
sbruens Dec 11, 2023
7d6a14f
Fix type.
sbruens Dec 11, 2023
768e144
Yes we get it. A string is not an int.
sbruens Dec 11, 2023
c47e0fa
Put the comment back. It's quite useful.
sbruens Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
"typescript": "^4"
},
"engines": {
"node": "^18.16.0",
"npm": "^9.5.1"
"node": "18.x.x"
},
"scripts": {
"action": "bash ./scripts/run_action.sh",
Expand Down
10 changes: 6 additions & 4 deletions src/server_manager/electron_and_karma_chromium.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@ import {config} from './package.json';

describe('Karma', () => {
it('uses the correct Chromium version', async (done) => {
// Omaha Proxy is a service maintained by the Chrome team which serves metadata about current
// ChromiumDash is a service maintained by the Chrome team which serves metadata about current
// and legacy Chrome versions.
const electronChromiumVersionInfo = <{chromium_base_position?: string}>(
const electronChromiumVersionInfo = <{chromium_main_branch_position?: number}>(
await (
await fetch(
`http://omahaproxy.appspot.com/deps.json?version=${electronToChromium(electronVersion)}`
`https://chromiumdash.appspot.com/fetch_version?version=${electronToChromium(
electronVersion
)}`
)
).json()
);
const electronChromeRevision = electronChromiumVersionInfo.chromium_base_position;
const electronChromeRevision = electronChromiumVersionInfo.chromium_main_branch_position;
expect(electronChromeRevision).toEqual(config.PUPPETEER_CHROMIUM_REVISION);
done();
});
Expand Down
4 changes: 2 additions & 2 deletions src/server_manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@
"PUPPETEER_CHROMIUM_REVISION": [
"The Chromium revision number used by Karma. This should always be the revision number of",
"the bundled Chromium in our version of Electron. Whenever upgrading Electron, run the",
"server_manager tests. You'll get a failure that looks like <Expected '812852' to equal '693954>.",
"server_manager tests. You'll get a failure that looks like <Expected 812852 to equal 693954>.",
"Set PUPPETEER_CHROMIUM_REVISION to the first of those numbers to get the correct revision",
"and `npm ci` to re-install puppeteer, causing it to download the new",
"Chromium version."
]
}
},
"config": {
"PUPPETEER_CHROMIUM_REVISION": "992738"
"PUPPETEER_CHROMIUM_REVISION": 992738
},
"devDependencies": {
"@types/node": "^16.11.29",
Expand Down
Loading