Commits:
-
2936205f
by Nicolas Vigier at 2023-08-23T19:07:33+02:00
Bug 40932: Clean up projects/release/update_responses_config.yml
Remove appname_bundle_android, appname_bundle_macos, appname_bundle_linux,
appname_bundle_win32, appname_bundle_win64 from
projects/release/update_responses_config.yml since they are not used
anymore after 9f201283811ec85c49ca81d27b728411e952a02b.
-
6c264f8e
by Nicolas Vigier at 2023-08-23T19:07:35+02:00
Bug 40931: Fix incrementals after #40829
We update tools/signing/nightly to fix signing of nightly incrementals.
We also update tools/update-responses/update_responses to fix the regexp
to match .mar and incremental.mar filenames, since the OS now includes
a `-` (except for macos).
We change the incremental filenames to use `--` instead of `-` to
separate OS and old_version, to make it easier to parse since both of
those can include a `-`.
5 changed files:
Changes:
projects/release/update_responses_config.yml
| ... |
... |
@@ -3,11 +3,6 @@ tmp_dir: '[% c("tmp_dir") %]' |
|
3
|
3
|
create_downloads_json: 1
|
|
4
|
4
|
appname_marfile: '[% c("var/project-name") %]'
|
|
5
|
5
|
appname_bundle: '[% c("var/project-name") %]'
|
|
6
|
|
-appname_bundle_android: '[% c("var/project-name") %]'
|
|
7
|
|
-appname_bundle_macos: '[% c("var/ProjectName") %]'
|
|
8
|
|
-appname_bundle_linux: '[% c("var/project-name") %]'
|
|
9
|
|
-appname_bundle_win32: '[% c("var/projectname") %]-install'
|
|
10
|
|
-appname_bundle_win64: '[% c("var/projectname") %]-install-win64'
|
|
11
|
6
|
releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %]
|
|
12
|
7
|
download:
|
|
13
|
8
|
gpg_keyring: ../../keyring/torbrowser.gpg
|
tools/signing/nightly/config.yml
| ... |
... |
@@ -12,6 +12,7 @@ torbrowser: |
|
12
|
12
|
- nightly-macos
|
|
13
|
13
|
nss_db_dir: nssdb
|
|
14
|
14
|
appname_marfile: tor-browser
|
|
|
15
|
+ appname_bundle: tor-browser
|
|
15
|
16
|
basebrowser:
|
|
16
|
17
|
publish_dirs:
|
|
17
|
18
|
- basebrowser-nightly-linux-x86_64
|
| ... |
... |
@@ -21,6 +22,7 @@ basebrowser: |
|
21
|
22
|
- basebrowser-nightly-macos
|
|
22
|
23
|
nss_db_dir: nssdb-basebrowser-1
|
|
23
|
24
|
appname_marfile: base-browser
|
|
|
25
|
+ appname_bundle: base-browser
|
|
24
|
26
|
nss_certname: nightly-marsigner
|
|
25
|
27
|
gpg_keyring: keyring/torbrowser-nightly.gpg
|
|
26
|
28
|
rsync_dest: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-updates/
|
tools/signing/nightly/sign-nightly
| ... |
... |
@@ -246,6 +246,7 @@ sub update_responses { |
|
246
|
246
|
$ur_config->{download}{mars_url} .= "/$publish_dir";
|
|
247
|
247
|
$ur_config->{releases_dir} = "$topdir/nightly/$publish_dir";
|
|
248
|
248
|
$ur_config->{appname_marfile} = get_config('appname_marfile');
|
|
|
249
|
+ $ur_config->{appname_bundle} = get_config('appname_bundle');
|
|
249
|
250
|
$ur_config->{channels}->{nightly} = $version;
|
|
250
|
251
|
$ur_config->{versions}->{$version} = $ur_config->{versions}->{nightly_version};
|
|
251
|
252
|
my $buildinfos = get_buildinfos("$topdir/nightly/$publish_dir/$version/build-infos.json");
|
tools/signing/nightly/update-responses-base-config.yml
| ... |
... |
@@ -2,13 +2,13 @@ |
|
2
|
2
|
download:
|
|
3
|
3
|
mars_url: https://nightlies.tbb.torproject.org/nightly-updates
|
|
4
|
4
|
build_targets:
|
|
5
|
|
- linux32: Linux_x86-gcc3
|
|
6
|
|
- linux64: Linux_x86_64-gcc3
|
|
7
|
|
- win32:
|
|
|
5
|
+ linux-i686: Linux_x86-gcc3
|
|
|
6
|
+ linux-x86_64: Linux_x86_64-gcc3
|
|
|
7
|
+ windows-i686:
|
|
8
|
8
|
- WINNT_x86-gcc3
|
|
9
|
9
|
- WINNT_x86-gcc3-x86
|
|
10
|
10
|
- WINNT_x86-gcc3-x64
|
|
11
|
|
- win64: WINNT_x86_64-gcc3-x64
|
|
|
11
|
+ windows-x86_64: WINNT_x86_64-gcc3-x64
|
|
12
|
12
|
macos:
|
|
13
|
13
|
- Darwin_x86_64-gcc3
|
|
14
|
14
|
- Darwin_aarch64-gcc3
|
| ... |
... |
@@ -16,20 +16,20 @@ channels: |
|
16
|
16
|
nightly: nightly_version
|
|
17
|
17
|
versions:
|
|
18
|
18
|
nightly_version:
|
|
19
|
|
- platformVersion: 68.2.0
|
|
|
19
|
+ platformVersion: 115.1.0
|
|
20
|
20
|
detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/
|
|
21
|
21
|
migrate_langs:
|
|
22
|
22
|
pt-PT: pt-BR
|
|
23
|
23
|
macos:
|
|
24
|
24
|
minSupportedOSVersion: 16.0.0
|
|
25
|
|
- win32:
|
|
|
25
|
+ windows-i686:
|
|
26
|
26
|
minSupportedOSVersion: 6.1
|
|
27
|
27
|
minSupportedInstructionSet: SSE2
|
|
28
|
|
- win64:
|
|
|
28
|
+ windows-x86_64:
|
|
29
|
29
|
minSupportedOSVersion: 6.1
|
|
30
|
30
|
minSupportedInstructionSet: SSE2
|
|
31
|
|
- linux32:
|
|
|
31
|
+ linux-i686:
|
|
32
|
32
|
minSupportedInstructionSet: SSE2
|
|
33
|
|
- linux64:
|
|
|
33
|
+ linux-x86_64:
|
|
34
|
34
|
minSupportedInstructionSet: SSE2
|
|
35
|
35
|
mar_compression: xz |
tools/update-responses/update_responses
| ... |
... |
@@ -98,7 +98,7 @@ sub get_version_files { |
|
98
|
98
|
opendir(my $d, $vdir) or exit_error "Error opening directory $vdir";
|
|
99
|
99
|
foreach my $file (readdir $d) {
|
|
100
|
100
|
next unless -f "$vdir/$file";
|
|
101
|
|
- if ($file =~ m/^$appname-([^-]+)-${version}_(.+)\.mar$/) {
|
|
|
101
|
+ if ($file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) {
|
|
102
|
102
|
my ($os, $lang) = ($1, $2);
|
|
103
|
103
|
$files->{$os}{$lang}{complete} = {
|
|
104
|
104
|
type => 'complete',
|
| ... |
... |
@@ -109,7 +109,7 @@ sub get_version_files { |
|
109
|
109
|
};
|
|
110
|
110
|
next;
|
|
111
|
111
|
}
|
|
112
|
|
- if ($file =~ m/^$appname-([^-]+)-(.+)-${version}_(.+)\.incremental\.mar$/) {
|
|
|
112
|
+ if ($file =~ m/^$appname-(.+)--(.+)-${version}_(.+)\.incremental\.mar$/) {
|
|
113
|
113
|
my ($os, $from_version, $lang) = ($1, $2, $3);
|
|
114
|
114
|
$files->{$os}{$lang}{partial}{$from_version} = {
|
|
115
|
115
|
type => 'partial',
|
| ... |
... |
@@ -223,7 +223,7 @@ sub mar_filename { |
|
223
|
223
|
sub create_incremental_mar {
|
|
224
|
224
|
my ($config, $pm, $from_version, $new_version, $os, $lang, $channel) = @_;
|
|
225
|
225
|
my $appname = $config->{appname_marfile};
|
|
226
|
|
- my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar";
|
|
|
226
|
+ my $mar_file = "$appname-$os--${from_version}-${new_version}_$lang.incremental.mar";
|
|
227
|
227
|
my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file;
|
|
228
|
228
|
if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) {
|
|
229
|
229
|
print "Skipping $mar_file\n";
|
|