Skip to content

Commit 90735da

Browse files
committed
get back original "yarn install" @ProtonMail stuff build script hack
* So updating "yarn" to 3.1.0-rc.3 didn't realy help (enabled in 4d914e1).
1 parent 2299d9a commit 90735da

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

scripts/prepare-webclient/webclients.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ async function executeBuildFlow<T extends FolderAsDomainEntry[]>(
247247

248248
await execShell(["git", ["reset", "--hard", tag], {cwd: repoDir}]);
249249

250-
// dropping unused applications
251-
await execShell(["npx", ["--no", "rimraf", "./applications/{storybook,vpn-settings}"], {cwd: repoDir}]);
252-
253250
{
254251
// TODO drop "postinstall" script wiping logic when all referenced https://github.com/ProtonMail/WebClients/tags get updated
255252
// see https://github.com/ProtonMail/WebClients/issues/254 for details
@@ -271,21 +268,20 @@ async function executeBuildFlow<T extends FolderAsDomainEntry[]>(
271268

272269
// TODO drop "yarn install" hacks when executing on CI env
273270
if (process.env.CI) {
274-
// updating yarn/berry to avoid the following error: YN0018: ... The remote archive doesn't match the expected checksum
275-
// see details in:
276-
// https://github.com/yarnpkg/berry/issues/1989#issuecomment-921906686
277-
// https://github.com/yarnpkg/berry/issues/1142
278-
await execShell(["yarn", ["set", "version", "3.1.0-rc.3"], {cwd: repoDir}]);
279-
await execShell(["yarn", ["plugin", "import", "workspace-tools"], {cwd: repoDir}]);
271+
// hacks applied to avoid the following error:
272+
// eslint-disable-next-line max-len
273+
// YN0018: │ sieve.js@https://github.com/ProtonMail/sieve.js.git#commit=a09ab52092164af74278e77612a091e730e9b7e9: The remote archive doesn't match the expected checksum
274+
// see https://github.com/yarnpkg/berry/issues/1142 and https://github.com/yarnpkg/berry/issues/1989 for details
275+
await execShell(["yarn", ["cache", "clean", "--all"], {cwd: repoDir}]);
280276
await execShell([
281-
"yarn",
282-
["install"],
277+
"yarn", ["install"],
283278
{
284279
cwd: repoDir,
285280
env: {
286281
...process.env,
287-
YARN_ENABLE_IMMUTABLE_INSTALLS: "false",
288282
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "1",
283+
YARN_CHECKSUM_BEHAVIOR: "update",
284+
YARN_ENABLE_IMMUTABLE_INSTALLS: "false",
289285
},
290286
},
291287
]);

0 commit comments

Comments
 (0)