Skip to content
Snippets Groups Projects
Verified Commit 210a4b2c authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 40703: Prepare alpha release 12.5a1

parent 42660210
No related branches found
No related tags found
1 merge request!612Bug 40703: Prepare alpha release 12.5a1
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 353 additions and 90 deletions
.gitlab/issue_templates/Release Prep - Alpha.md
+ 2
− 6
View file @ 210a4b2c
......@@ -69,11 +69,6 @@
<summary>Shared</summary>
### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git
- [ ] ***(Optional)*** Update torbutton translations in `toolkit/torbutton`
- [ ] `./import-translations.sh`
- **NOTE** : if there are no new strings imported then we are done here
- [ ] Commit as `fixup!` to the `Add TorStrings module for localization` commit
- **NOTE** : only add files which are already being tracked
- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release
- [ ] ***(Optional, Chemspill)*** Backport security-fixes to both `tor-browser` and `base-browser` branches
- [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)`
......@@ -126,6 +121,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
- [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
- [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
- [ ] Update `projects/translation/config`:
- [ ] run `tools/get-translation-hashes` to get updated hashes
- [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
- [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
- [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch
......
......
projects/android-components/config
+ 3
− 2
View file @ 210a4b2c
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build5'
git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/browser_branch") %]-build[% c("var/android_components_build") %]'
git_url: https://gitlab.torproject.org/tpo/applications/android-components.git
tag_gpg_id: 1
gpg_keyring:
......@@ -13,7 +13,8 @@ container:
var:
android_components_version: 102.0.14
torbrowser_branch: 12.0
browser_branch: 12.5-1
android_components_build: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 37
gradle_version: 7.0.2
......
......
projects/browser/Bundle-Data/Docs/ChangeLog.txt
+ 255
− 2
View file @ 210a4b2c
This diff is collapsed.
projects/browser/allowed_addons.json
+ 60
− 60
View file @ 210a4b2c
......@@ -17,7 +17,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.png?modified=1565722641"
}
],
"average_daily_users": 909198,
"average_daily_users": 920784,
"categories": {
"android": [
"experimental",
......@@ -221,10 +221,10 @@
"category": "recommended"
},
"ratings": {
"average": 4.5584,
"bayesian_average": 4.557180943955026,
"count": 4710,
"text_count": 1504
"average": 4.5582,
"bayesian_average": 4.556981916903566,
"count": 4742,
"text_count": 1512
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/",
"requires_payment": false,
......@@ -321,7 +321,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/",
"weekly_downloads": 25656
"weekly_downloads": 25636
},
"notes": null
},
......@@ -337,7 +337,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?modified=1469820907"
}
],
"average_daily_users": 669887,
"average_daily_users": 661005,
"categories": {
"android": [
"security-privacy"
......@@ -469,9 +469,9 @@
"category": "spotlight"
},
"ratings": {
"average": 4.6597,
"bayesian_average": 4.657149505820861,
"count": 2307,
"average": 4.6599,
"bayesian_average": 4.657336257654981,
"count": 2311,
"text_count": 460
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/",
......@@ -501,7 +501,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/",
"weekly_downloads": 7804
"weekly_downloads": 5713
},
"notes": null
},
......@@ -517,7 +517,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?modified=1550343990"
}
],
"average_daily_users": 256617,
"average_daily_users": 257005,
"categories": {
"android": [
"security-privacy"
......@@ -732,9 +732,9 @@
"category": "recommended"
},
"ratings": {
"average": 4.82,
"bayesian_average": 4.815284382393805,
"count": 1300,
"average": 4.8208,
"bayesian_average": 4.816082492766398,
"count": 1306,
"text_count": 235
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/",
......@@ -820,7 +820,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/",
"weekly_downloads": 5014
"weekly_downloads": 4839
},
"notes": null
},
......@@ -836,7 +836,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?modified=1469820907"
}
],
"average_daily_users": 1080325,
"average_daily_users": 1077418,
"categories": {
"android": [
"security-privacy"
......@@ -1358,10 +1358,10 @@
"category": "recommended"
},
"ratings": {
"average": 4.7978,
"bayesian_average": 4.794944343168069,
"count": 2136,
"text_count": 419
"average": 4.7982,
"bayesian_average": 4.7953467483624355,
"count": 2151,
"text_count": 423
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/",
"requires_payment": false,
......@@ -1385,7 +1385,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/",
"weekly_downloads": 23645
"weekly_downloads": 18282
},
"notes": null
},
......@@ -1401,7 +1401,7 @@
"picture_url": null
}
],
"average_daily_users": 6109476,
"average_daily_users": 6143701,
"categories": {
"android": [
"security-privacy"
......@@ -1565,7 +1565,7 @@
},
"is_disabled": false,
"is_experimental": false,
"last_updated": "2022-11-21T14:05:21Z",
"last_updated": "2022-12-15T18:40:20Z",
"name": {
"ar": "uBlock Origin",
"bg": "uBlock Origin",
......@@ -1710,10 +1710,10 @@
"category": "recommended"
},
"ratings": {
"average": 4.7782,
"bayesian_average": 4.777784409823513,
"count": 14615,
"text_count": 3832
"average": 4.7784,
"bayesian_average": 4.777984735280378,
"count": 14716,
"text_count": 3857
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/",
"requires_payment": false,
......@@ -1775,7 +1775,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/",
"weekly_downloads": 145268
"weekly_downloads": 144039
},
"notes": null
},
......@@ -1791,7 +1791,7 @@
"picture_url": null
}
],
"average_daily_users": 137691,
"average_daily_users": 139255,
"categories": {
"android": [
"photos-media"
......@@ -1888,9 +1888,9 @@
"category": "recommended"
},
"ratings": {
"average": 4.5084,
"bayesian_average": 4.503134943951076,
"count": 1074,
"average": 4.5097,
"bayesian_average": 4.5044214841383585,
"count": 1077,
"text_count": 399
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/reviews/",
......@@ -1913,7 +1913,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/versions/",
"weekly_downloads": 367
"weekly_downloads": 309
},
"notes": null
},
......@@ -1929,7 +1929,7 @@
"picture_url": null
}
],
"average_daily_users": 93297,
"average_daily_users": 92068,
"categories": {
"android": [
"experimental",
......@@ -2066,7 +2066,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/",
"weekly_downloads": 578
"weekly_downloads": 609
},
"notes": null
},
......@@ -2082,7 +2082,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.png?modified=1651263207"
}
],
"average_daily_users": 241693,
"average_daily_users": 242609,
"categories": {
"android": [
"photos-media",
......@@ -2300,10 +2300,10 @@
"category": "recommended"
},
"ratings": {
"average": 4.6475,
"bayesian_average": 4.6426080367355835,
"count": 1200,
"text_count": 234
"average": 4.646,
"bayesian_average": 4.641119725504792,
"count": 1209,
"text_count": 237
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/",
"requires_payment": false,
......@@ -2324,7 +2324,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/",
"weekly_downloads": 3908
"weekly_downloads": 3474
},
"notes": null
},
......@@ -2347,7 +2347,7 @@
"picture_url": null
}
],
"average_daily_users": 97618,
"average_daily_users": 99861,
"categories": {
"android": [
"other"
......@@ -2629,9 +2629,9 @@
"category": "recommended"
},
"ratings": {
"average": 4.4413,
"bayesian_average": 4.436575665528032,
"count": 1176,
"average": 4.4392,
"bayesian_average": 4.434480963861528,
"count": 1184,
"text_count": 316
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/",
......@@ -2652,7 +2652,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/",
"weekly_downloads": 37
"weekly_downloads": 45
},
"notes": null
},
......@@ -2668,7 +2668,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified=1506804587"
}
],
"average_daily_users": 331471,
"average_daily_users": 328150,
"categories": {
"android": [
"performance",
......@@ -2785,7 +2785,7 @@
},
"is_disabled": false,
"is_experimental": false,
"last_updated": "2022-11-22T09:08:25Z",
"last_updated": "2022-12-04T09:05:24Z",
"name": {
"de": "NoScript",
"el": "NoScript",
......@@ -2857,10 +2857,10 @@
"category": "recommended"
},
"ratings": {
"average": 4.4093,
"bayesian_average": 4.406550750110661,
"count": 2006,
"text_count": 784
"average": 4.4106,
"bayesian_average": 4.4078510292178406,
"count": 2019,
"text_count": 790
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/",
"requires_payment": false,
......@@ -2904,7 +2904,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/",
"weekly_downloads": 7527
"weekly_downloads": 7328
},
"notes": null
},
......@@ -2920,7 +2920,7 @@
"picture_url": null
}
],
"average_daily_users": 140511,
"average_daily_users": 140692,
"categories": {
"android": [
"performance",
......@@ -3034,10 +3034,10 @@
"category": "recommended"
},
"ratings": {
"average": 3.9128,
"bayesian_average": 3.90842770432453,
"count": 1089,
"text_count": 388
"average": 3.916,
"bayesian_average": 3.911620482957336,
"count": 1095,
"text_count": 393
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/reviews/",
"requires_payment": false,
......@@ -3056,7 +3056,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/versions/",
"weekly_downloads": 1431
"weekly_downloads": 1318
},
"notes": null
}
......
......
projects/fenix/config
+ 3
− 2
View file @ 210a4b2c
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build6'
git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/browser_branch") %]-build[% c("var/fenix_build") %]'
git_url: https://gitlab.torproject.org/tpo/applications/fenix.git
tag_gpg_id: 1
gpg_keyring:
......@@ -13,7 +13,8 @@ container:
var:
fenix_version: 102.2.1
torbrowser_branch: 12.0
browser_branch: 12.5-1
fenix_build: 1
git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1'
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
# This should be updated when the list of gradle dependencies is changed.
......
......
projects/firefox/config
+ 3
− 4
View file @ 210a4b2c
......@@ -4,7 +4,6 @@ filename: 'firefox-[% c("var/project-name") %]-[% c("version") %]-[% c("var/osna
git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]'
tag_gpg_id: 1
git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git
git_submodule: 1
gpg_keyring:
- pierov.gpg
- richard.gpg
......@@ -12,10 +11,10 @@ container:
use_container: 1
var:
firefox_platform_version: 102.5.0
firefox_platform_version: 102.6.0
firefox_version: '[% c("var/firefox_platform_version") %]esr'
browser_branch: '12.0-1'
browser_build: 4
browser_branch: '12.5-1'
browser_build: 1
branding_directory: 'browser/branding/alpha'
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
nightly_updates_osname: '[% c("var/osname") %]'
......
......
projects/geckoview/config
+ 4
− 4
View file @ 210a4b2c
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build4'
git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]'
tag_gpg_id: 1
git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git
git_submodule: 1
gpg_keyring:
- pierov.gpg
- richard.gpg
......@@ -12,8 +11,9 @@ container:
use_container: 1
var:
geckoview_version: 102.5.0esr
torbrowser_branch: 12.0
geckoview_version: 102.6.0esr
browser_branch: 12.5-1
browser_build: 1
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
- build-essential
......
......
projects/go/config
+ 2
− 2
View file @ 210a4b2c
# vim: filetype=yaml sw=2
version: 1.19.3
version: 1.19.4
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
......@@ -121,7 +121,7 @@ input_files:
enable: '[% ! c("var/linux") %]'
- URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
name: go
sha256sum: 18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212
sha256sum: eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368
- URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
name: go14
sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
......
......
projects/manual/config
+ 3
− 3
View file @ 210a4b2c
# vim: filetype=yaml sw=2
# To update, see doc/how-to-update-the-manual.txt
# Remember to update also the package's hash, with the version!
version: 56847
version: 60224
filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
......@@ -17,8 +17,8 @@ var:
input_files:
- project: container-image
- URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip'
- URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip'
name: manual
sha256sum: f22d6206c668eee194e19bc27f39e4bbe1d21c20dc69064f67dc3f9db52525e9
sha256sum: a76908f228d006b49f18ff731d4bd9ff220183535b2c1ccc9bb92c78709e1966
- filename: packagemanual.py
name: package_script
projects/tor/config
+ 1
− 1
View file @ 210a4b2c
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
version: 0.4.7.11
version: 0.4.7.12
git_hash: 'tor-[% c("version") %]'
git_url: https://gitlab.torproject.org/tpo/core/tor.git
git_submodule: 1
......
......
projects/translation/config
+ 2
− 2
View file @ 210a4b2c
......@@ -18,7 +18,7 @@ steps:
git_hash: 'basebrowser-newidentityftl'
tor-browser:
tor-browser: '[% INCLUDE build %]'
git_hash: 4cd0600f352a6883462dbdc1b59119a0a946be10
git_hash: 6a1d58f5d3c749a55d18e7dc6d902d9b622e8d5d
targets:
nightly:
git_hash: 'tor-browser'
......@@ -26,7 +26,7 @@ steps:
fenix: '[% INCLUDE build %]'
# We need to bump the commit before releasing but just pointing to a branch
# might cause too much rebuidling of the Firefox part.
git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35
git_hash: 3abd32f7db3779af063d937f8a5d87b88504b006
targets:
nightly:
git_hash: 'fenix-torbrowserstringsxml'
rbm.conf
+ 2
− 2
View file @ 210a4b2c
......@@ -71,10 +71,10 @@ buildconf:
git_signtag_opt: '-s'
var:
torbrowser_version: '12.0a5'
torbrowser_version: '12.5a1'
torbrowser_build: 'build1'
torbrowser_incremental_from:
- 12.0a4
- 12.0a5
build_mar: 1
# By default, we sort the list of installed packages. This allows sharing
# containers with identical list of packages, even if they are not listed
......
......
tools/get-translation-hashes 0 → 100755
+ 13
− 0
View file @ 210a4b2c
#!/bin/bash
cd "$(dirname "$0")/../git_clones/translation"
git fetch > /dev/null 2>&1
echo -n "base-browser: "
git rev-parse origin/base-browser
echo -n "base-browser-fluent: "
git rev-parse origin/basebrowser-newidentityftl
echo -n "tor-browser: "
git rev-parse origin/tor-browser
echo -n "fenix: "
git rev-parse origin/fenix-torbrowserstringsxml
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment