From 8895da09264d15699b52d626b53807d3cc9ccc68 Mon Sep 17 00:00:00 2001 From: Raul Lopes Date: Fri, 10 May 2019 02:58:03 -0300 Subject: [PATCH 1/5] firefox-nightly: fix version and enable autoupdate also downloads .zip release of firefox nightly instead of the installer .exe --- bucket/firefox-nightly.json | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/bucket/firefox-nightly.json b/bucket/firefox-nightly.json index adaa45e634d7f5..ab8e39e5ace6d9 100644 --- a/bucket/firefox-nightly.json +++ b/bucket/firefox-nightly.json @@ -1,17 +1,19 @@ { "description": "Nightly builds of Firefox: the popular open source web browser.", "homepage": "https://www.mozilla.org/en-US/firefox/nightly/", - "version": "nightly", + "version": "68.0a1", "license": "MPL-2.0", "architecture": { "64bit": { - "url": "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=win64&lang=en-US#/firefox.7z" + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-68.0a1.en-US.win64.zip", + "hash": "9c029b39249dbabf4747fe2e7d0e330c6f519c588c98d859a91a4ea70ea6ff0d" }, "32bit": { - "url": "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=win&lang=en-US#/firefox.7z" + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-68.0a1.en-US.win32.zip", + "hash": "9831d9916cc091ff999ea73de5406a32c3c6dec5651b6d6b609bbdb0a118781d" } }, - "extract_dir": "core", + "extract_dir": "firefox", "bin": [ [ "firefox.exe", @@ -23,5 +25,27 @@ "firefox.exe", "Firefox Nightly" ] - ] + ], + "checkver": { + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/", + "re": "firefox-([\\d\\.]+a\\d+)\\.en-US" + }, + "autoupdate": { + "architecture": { + "64bit": { + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.zip", + "hash": { + "find": "([a-f0-9]{64})\\ssha256\\s\\d+\\sfirefox-$version.en-US.win64.zip", + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.checksums" + } + }, + "32bit": { + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win32.zip", + "hash": { + "find": "([a-f0-9]{64})\\ssha256\\s\\d+\\sfirefox-$version.en-US.win32.zip", + "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win32.checksums" + } + } + } + } } From 8a5995ad2c33a5f607f289b34d0aec28e2c90d96 Mon Sep 17 00:00:00 2001 From: Raul Lopes Date: Fri, 10 May 2019 11:31:59 -0300 Subject: [PATCH 2/5] firefox-nightly: improve hash find expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jakub Čábera --- bucket/firefox-nightly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bucket/firefox-nightly.json b/bucket/firefox-nightly.json index ab8e39e5ace6d9..0f92ea7c640963 100644 --- a/bucket/firefox-nightly.json +++ b/bucket/firefox-nightly.json @@ -35,7 +35,7 @@ "64bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.zip", "hash": { - "find": "([a-f0-9]{64})\\ssha256\\s\\d+\\sfirefox-$version.en-US.win64.zip", + "regex": "(^$sha256\\ssha256\\s\\d+\\s$basename", "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.checksums" } }, From c1b58a1f613ac4b902ab2d686f477c474b4eb59a Mon Sep 17 00:00:00 2001 From: Raul Lopes Date: Fri, 10 May 2019 11:34:34 -0300 Subject: [PATCH 3/5] Update bucket/firefox-nightly.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jakub Čábera --- bucket/firefox-nightly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bucket/firefox-nightly.json b/bucket/firefox-nightly.json index 0f92ea7c640963..915b1e830b0b4f 100644 --- a/bucket/firefox-nightly.json +++ b/bucket/firefox-nightly.json @@ -28,7 +28,7 @@ ], "checkver": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/", - "re": "firefox-([\\d\\.]+a\\d+)\\.en-US" + "regex": "firefox-([\\w.]+)\\.en-US" }, "autoupdate": { "architecture": { From f411ec3fa36fee43c34af398bf0f281cb543f586 Mon Sep 17 00:00:00 2001 From: Raul Lopes Date: Fri, 10 May 2019 12:32:35 -0300 Subject: [PATCH 4/5] fix hash regex and update 32bit hash regex --- bucket/firefox-nightly.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bucket/firefox-nightly.json b/bucket/firefox-nightly.json index 915b1e830b0b4f..1a764e74e80731 100644 --- a/bucket/firefox-nightly.json +++ b/bucket/firefox-nightly.json @@ -6,11 +6,11 @@ "architecture": { "64bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-68.0a1.en-US.win64.zip", - "hash": "9c029b39249dbabf4747fe2e7d0e330c6f519c588c98d859a91a4ea70ea6ff0d" + "hash": "sha512:fd291fb029198c39602cb14aad644ac0cd683160a39a86e1d4d15f12df6e858e7df6d81dc6b4fe326570805a79aa52f1d0e12a37956480e1fbd4210fe9fca91e" }, "32bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-68.0a1.en-US.win32.zip", - "hash": "9831d9916cc091ff999ea73de5406a32c3c6dec5651b6d6b609bbdb0a118781d" + "hash": "sha512:b59bd83494b13bda45225195cb9b268a8324e9d239a9123d2ad4cc23deb03dfd5c6b81ee0062e181c19448978ae9e9a2beeaf7b05c8d92968949f1b744d08429" } }, "extract_dir": "firefox", @@ -35,14 +35,14 @@ "64bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.zip", "hash": { - "regex": "(^$sha256\\ssha256\\s\\d+\\s$basename", + "regex": "(^$sha256)\\ssha256\\s\\d+\\s$basename", "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.checksums" } }, "32bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win32.zip", "hash": { - "find": "([a-f0-9]{64})\\ssha256\\s\\d+\\sfirefox-$version.en-US.win32.zip", + "regex": "(^$sha256)\\ssha256\\s\\d+\\s$basename", "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win32.checksums" } } From c56f77380ebe14cce3903c46dc46a9c08986b6cf Mon Sep 17 00:00:00 2001 From: Raul Lopes Date: Fri, 10 May 2019 12:59:34 -0300 Subject: [PATCH 5/5] firefox-nightly: remove hash regex it's unnecessary since checkver -u can figure that out automatically --- bucket/firefox-nightly.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/bucket/firefox-nightly.json b/bucket/firefox-nightly.json index 1a764e74e80731..9ace883b3742f2 100644 --- a/bucket/firefox-nightly.json +++ b/bucket/firefox-nightly.json @@ -35,14 +35,12 @@ "64bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.zip", "hash": { - "regex": "(^$sha256)\\ssha256\\s\\d+\\s$basename", "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win64.checksums" } }, "32bit": { "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win32.zip", "hash": { - "regex": "(^$sha256)\\ssha256\\s\\d+\\s$basename", "url": "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$version.en-US.win32.checksums" } }