boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
b1ae0065
by Nicolas Vigier at 2024-04-12T21:11:31+02:00
4 changed files:
- .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
- .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
- projects/browser/config
- rbm.conf
Changes:
| ... | ... | @@ -39,6 +39,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch |
| 39 | 39 | - [ ] Update `rbm.conf`
|
| 40 | 40 | - [ ] `var/torbrowser_version` : update to next version
|
| 41 | 41 | - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)`
|
| 42 | + - [ ] `var/browser_release_date` : update to build date
|
|
| 42 | 43 | - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version
|
| 43 | 44 | - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update
|
| 44 | 45 | - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail
|
| ... | ... | @@ -38,6 +38,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch |
| 38 | 38 | - [ ] Update `rbm.conf`
|
| 39 | 39 | - [ ] `var/torbrowser_version` : update to next version
|
| 40 | 40 | - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)`
|
| 41 | + - [ ] `var/browser_release_date` : update to build date
|
|
| 41 | 42 | - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version
|
| 42 | 43 | - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update
|
| 43 | 44 | - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail
|
| 1 | 1 | # vim: filetype=yaml sw=2
|
| 2 | 2 | version: '[% c("var/torbrowser_version") %]'
|
| 3 | 3 | filename: '[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
|
| 4 | +timestamp: '[% c("var/browser_release_date_timestamp") %]'
|
|
| 4 | 5 | container:
|
| 5 | 6 | use_container: 1
|
| 6 | 7 |
| ... | ... | @@ -79,6 +79,8 @@ var: |
| 79 | 79 | - '13.5a5'
|
| 80 | 80 | - '13.5a4'
|
| 81 | 81 | - '13.5a3'
|
| 82 | + browser_release_date: '2024/03/28 01:02:03'
|
|
| 83 | + browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
|
|
| 82 | 84 | updater_enabled: 1
|
| 83 | 85 | build_mar: 1
|
| 84 | 86 | mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
|
| ... | ... | @@ -206,7 +208,8 @@ var: |
| 206 | 208 | [% END -%]
|
| 207 | 209 | |
| 208 | 210 | DOCSDIR_project: '[% project %]'
|
| 209 | - set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var_p/MOZ_BUILD_DATE") %]'
|
|
| 211 | + set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var/MOZ_BUILD_DATE") %]'
|
|
| 212 | + MOZ_BUILD_DATE: '[% USE date; date.format(c("var/browser_release_date"), "%Y%m%d%H%M%S") %]'
|
|
| 210 | 213 | |
| 211 | 214 | # var/essential_deps is the same as var/deps, except that we never
|
| 212 | 215 | # redefine it in projects config. This is for the packages we want to
|
| ... | ... | @@ -248,6 +251,14 @@ targets: |
| 248 | 251 | GET c("var_p/nightly_torbrowser_version");
|
| 249 | 252 | END;
|
| 250 | 253 | -%]
|
| 254 | + browser_release_date: |
|
|
| 255 | + [%
|
|
| 256 | + IF (matches = c("var/torbrowser_version").match('^tbb-nightly\.(\d\d\d\d)\.(\d\d)\.(\d\d)$'));
|
|
| 257 | + GET matches.0 _ "/" _ matches.1 _ "/" _ matches.2 _ " 01:01:01";
|
|
| 258 | + ELSE;
|
|
| 259 | + GET "2000/01/01 01:01:01";
|
|
| 260 | + END
|
|
| 261 | + -%]
|
|
| 251 | 262 | max_torbrowser_incremental_from: 2
|
| 252 | 263 | build_infos_json: 1
|
| 253 | 264 | |
| ... | ... | @@ -727,31 +738,5 @@ gpg_allow_expired_keys: 1 |
| 727 | 738 | }
|
| 728 | 739 | return [@res];
|
| 729 | 740 | },
|
| 730 | - MOZ_BUILD_DATE => sub {
|
|
| 731 | - use POSIX qw(strftime);
|
|
| 732 | - my ($project, $options) = @_;
|
|
| 733 | - my $nightly = project_config($project, 'var/nightly', $options);
|
|
| 734 | - my $testbuild = project_config($project, 'var/testbuild', $options);
|
|
| 735 | - |
|
| 736 | - if ($nightly && !$testbuild) {
|
|
| 737 | - my $torbrowser_version = project_config($project, 'var/torbrowser_version', $options);
|
|
| 738 | - return sprintf("%d%02d%02d000001", $1, $2, $3)
|
|
| 739 | - if $torbrowser_version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/;
|
|
| 740 | - return strftime("%Y%m%d000001", gmtime);
|
|
| 741 | - }
|
|
| 742 | - |
|
| 743 | - my $timestamp = project_config($project, 'timestamp', $options);
|
|
| 744 | - if (!$nightly) {
|
|
| 745 | - my $torbrowser_version = project_config($project, 'var/torbrowser_version', $options);
|
|
| 746 | - my @n = reverse split /[\.\D]/, $torbrowser_version;
|
|
| 747 | - my $i = 1;
|
|
| 748 | - unshift @n, 0 if @n < 3;
|
|
| 749 | - for my $n (@n) {
|
|
| 750 | - $timestamp += $n * $i;
|
|
| 751 | - $i = $i * 10;
|
|
| 752 | - }
|
|
| 753 | - }
|
|
| 754 | - return strftime "%Y%m%d%H%M%S", gmtime($timestamp);
|
|
| 755 | - },
|
|
| 756 | 741 | },
|
| 757 | 742 | ) |