summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 05:50:19 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 05:50:19 +0000
commitb6a97bcbb33b667a7ee4acb2eb8e482333e95a1b (patch)
tree89830d7d7c2cd02e552447883d02800d56cdf323 /dist
parentReleasing progress-linux version 1.55.0+dfsg-1~progress7.99u1. (diff)
downloadublock-origin-b6a97bcbb33b667a7ee4acb2eb8e482333e95a1b.tar.xz
ublock-origin-b6a97bcbb33b667a7ee4acb2eb8e482333e95a1b.zip
Merging upstream version 1.57.0+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dist')
-rwxr-xr-xdist/chromium/publish-beta.py4
-rwxr-xr-xdist/firefox/publish-signed-beta.py4
-rw-r--r--dist/firefox/updates.json4
-rwxr-xr-xdist/mv3/firefox/publish-signed-beta.py4
-rw-r--r--dist/version2
5 files changed, 9 insertions, 9 deletions
diff --git a/dist/chromium/publish-beta.py b/dist/chromium/publish-beta.py
index 5a6e19f..a731e9b 100755
--- a/dist/chromium/publish-beta.py
+++ b/dist/chromium/publish-beta.py
@@ -43,9 +43,9 @@ github_owner = 'gorhill'
github_repo = 'uBlock'
# Load/save auth secrets
-# The build directory is excluded from git
+# The tmp directory is excluded from git
ubo_secrets = dict()
-ubo_secrets_filename = os.path.join(projdir, 'dist', 'build', 'ubo_secrets')
+ubo_secrets_filename = os.path.join(projdir, 'tmp', 'ubo_secrets')
if os.path.isfile(ubo_secrets_filename):
with open(ubo_secrets_filename) as f:
ubo_secrets = json.load(f)
diff --git a/dist/firefox/publish-signed-beta.py b/dist/firefox/publish-signed-beta.py
index 2e56d12..ed542ef 100755
--- a/dist/firefox/publish-signed-beta.py
+++ b/dist/firefox/publish-signed-beta.py
@@ -69,9 +69,9 @@ github_owner = 'gorhill'
github_repo = 'uBlock'
# Load/save auth secrets
-# The build directory is excluded from git
+# The tmp directory is excluded from git
ubo_secrets = dict()
-ubo_secrets_filename = os.path.join(projdir, 'dist', 'build', 'ubo_secrets')
+ubo_secrets_filename = os.path.join(projdir, 'tmp', 'ubo_secrets')
if os.path.isfile(ubo_secrets_filename):
with open(ubo_secrets_filename) as f:
ubo_secrets = json.load(f)
diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json
index 880063f..0eab531 100644
--- a/dist/firefox/updates.json
+++ b/dist/firefox/updates.json
@@ -3,9 +3,9 @@
"uBlock0@raymondhill.net": {
"updates": [
{
- "version": "1.54.1.102",
+ "version": "1.56.1.105",
"browser_specific_settings": { "gecko": { "strict_min_version": "78.0" } },
- "update_link": "https://github.com/gorhill/uBlock/releases/download/1.54.1rc2/uBlock0_1.54.1rc2.firefox.signed.xpi"
+ "update_link": "https://github.com/gorhill/uBlock/releases/download/1.56.1rc5/uBlock0_1.56.1rc5.firefox.signed.xpi"
}
]
}
diff --git a/dist/mv3/firefox/publish-signed-beta.py b/dist/mv3/firefox/publish-signed-beta.py
index 0c5f8cd..f298cc8 100755
--- a/dist/mv3/firefox/publish-signed-beta.py
+++ b/dist/mv3/firefox/publish-signed-beta.py
@@ -64,9 +64,9 @@ github_owner = 'gorhill'
github_repo = 'uBlock'
# Load/save auth secrets
-# The build directory is excluded from git
+# The tmp directory is excluded from git
ubo_secrets = dict()
-ubo_secrets_filename = os.path.join(projdir, 'dist', 'build', 'ubo_secrets')
+ubo_secrets_filename = os.path.join(projdir, 'tmp', 'ubo_secrets')
if os.path.isfile(ubo_secrets_filename):
with open(ubo_secrets_filename) as f:
ubo_secrets = json.load(f)
diff --git a/dist/version b/dist/version
index 094d6ad..373aea9 100644
--- a/dist/version
+++ b/dist/version
@@ -1 +1 @@
-1.55.0
+1.57.0