From 9fc172f3c4930675bf6ae36fa61efc108856347e Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 1 Jan 2019 13:22:04 -0500 Subject: [PATCH 1/2] Make Firefox dev build auto-update --- dist/firefox/updates.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json index a561ef005..8946944b7 100644 --- a/dist/firefox/updates.json +++ b/dist/firefox/updates.json @@ -3,10 +3,10 @@ "uBlock0@raymondhill.net": { "updates": [ { - "version": "1.17.7.0", + "version": "1.17.7.1", "applications": { "gecko": { "strict_min_version": "52" } }, - "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.17.7b0", - "update_link": "https://github.com/gorhill/uBlock/releases/download/1.17.7b0/uBlock0_1.17.7b0.firefox.signed.xpi" + "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.17.7b1", + "update_link": "https://github.com/gorhill/uBlock/releases/download/1.17.7b1/uBlock0_1.17.7b1.firefox.signed.xpi" } ] } From 7c952454244d7c59fb2b80d7491f9a76fc9a3f38 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 1 Jan 2019 13:25:12 -0500 Subject: [PATCH 2/2] Enable updating `updates.json` on any branch --- dist/firefox/publish-signed-beta.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/firefox/publish-signed-beta.py b/dist/firefox/publish-signed-beta.py index 3f0b526fe..dee504390 100755 --- a/dist/firefox/publish-signed-beta.py +++ b/dist/firefox/publish-signed-beta.py @@ -297,7 +297,7 @@ with open(updates_json_filepath) as f: r = subprocess.run(['git', 'status', '-s', updates_json_filepath], stdout=subprocess.PIPE) rout = bytes.decode(r.stdout).strip() if len(rout) >= 2 and rout[0] == 'M': - subprocess.run(['git', 'commit', '-m', 'make Firefox dev build auto-update', updates_json_filepath]) - subprocess.run(['git', 'push', 'origin', 'master']) + subprocess.run(['git', 'commit', '-m', 'Make Firefox dev build auto-update', updates_json_filepath]) + subprocess.run(['git', 'push', 'origin', 'HEAD']) print('All done.')