From 8ab394bb622ffc939bd6112e263d39a7a7b0700a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sun, 25 Jun 2023 09:01:02 +0200 Subject: [PATCH] Remove 0003 patch --- autoroll.ts | 40 +++++++++---------- ...sable-snapshot-checksum-verification.patch | 24 ----------- 2 files changed, 20 insertions(+), 44 deletions(-) delete mode 100644 patches/0003-Disable-snapshot-checksum-verification.patch diff --git a/autoroll.ts b/autoroll.ts index 023bcb52aac..26971def750 100644 --- a/autoroll.ts +++ b/autoroll.ts @@ -111,14 +111,14 @@ for (const version of V8_VERSIONS) { const versionDotH = await Deno.readTextFile("./v8/include/v8-version.h"); const upstreamVersion = extractVersion(versionDotH); - // If the upstream version does not match the current version, then we need to - // roll. - if (upstreamVersion === currentVersion) { - console.log( - `Upstream version ${upstreamVersion} matches current version ${currentVersion}. No need to roll ${UPSTREAM_LKGR}.`, - ); - continue; - } + // // If the upstream version does not match the current version, then we need to + // // roll. + // if (upstreamVersion === currentVersion) { + // console.log( + // `Upstream version ${upstreamVersion} matches current version ${currentVersion}. No need to roll ${UPSTREAM_LKGR}.`, + // ); + // continue; + // } console.log( `Upstream version ${upstreamVersion} does not match current version ${currentVersion}. Rolling ${UPSTREAM_LKGR}...`, @@ -137,19 +137,19 @@ for (const version of V8_VERSIONS) { } // Force push the branch to the denoland remote. - console.log("Pushing the branch to the remote. This might take a minute."); - await run("git", ["push", "--force", "denoland", DENOLAND_LKGR]); + // console.log("Pushing the branch to the remote. This might take a minute."); + // await run("git", ["push", "--force", "denoland", DENOLAND_LKGR]); - // Get the current commit. - const commit = await runAndCollect("git", ["rev-parse", DENOLAND_LKGR]); - const currentCommit = new TextDecoder().decode(commit).trim(); + // // Get the current commit. + // const commit = await runAndCollect("git", ["rev-parse", DENOLAND_LKGR]); + // const currentCommit = new TextDecoder().decode(commit).trim(); - // Create a tag for the new version. - const TAG = `${upstreamVersion}-denoland-${currentCommit.slice(0, 20)}`; - console.log(`Creating tag ${TAG}`); - await run("git", ["tag", TAG]); + // // Create a tag for the new version. + // const TAG = `${upstreamVersion}-denoland-${currentCommit.slice(0, 20)}`; + // console.log(`Creating tag ${TAG}`); + // await run("git", ["tag", TAG]); - // Push the tag to the denoland remote. - console.log("Pushing the tag to the remote."); - await run("git", ["push", "denoland", TAG]); + // // Push the tag to the denoland remote. + // console.log("Pushing the tag to the remote."); + // await run("git", ["push", "denoland", TAG]); } diff --git a/patches/0003-Disable-snapshot-checksum-verification.patch b/patches/0003-Disable-snapshot-checksum-verification.patch deleted file mode 100644 index 45006cd3004..00000000000 --- a/patches/0003-Disable-snapshot-checksum-verification.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9866c9aea05f9215e6c91cc8d7dd780d706e8286 Mon Sep 17 00:00:00 2001 -From: Divy Srivastava -Date: Thu, 9 Mar 2023 17:18:38 +0530 -Subject: [PATCH] Disable snapshot checksum verification - ---- - src/snapshot/mksnapshot.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/snapshot/mksnapshot.cc b/src/snapshot/mksnapshot.cc -index ef606e87e1..949e9bafbd 100644 ---- a/src/snapshot/mksnapshot.cc -+++ b/src/snapshot/mksnapshot.cc -@@ -88,7 +88,7 @@ class SnapshotFileWriter { - fprintf( - fp, - "bool Snapshot::ShouldVerifyChecksum(const v8::StartupData* data) {\n"); -- fprintf(fp, " return true;\n"); -+ fprintf(fp, " return false;\n"); - fprintf(fp, "}\n"); - fprintf(fp, "} // namespace internal\n"); - fprintf(fp, "} // namespace v8\n"); --- -2.37.1 (Apple Git-137.1)