| ... |
... |
@@ -8,6 +8,9 @@ var: |
|
8
|
8
|
publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]'
|
|
9
|
9
|
containers_target: with_containers
|
|
10
|
10
|
|
|
|
11
|
+ linux-packages: '[% ( c("var/browser_platforms/linux-i686") || c("var/browser_platforms/linux-x86_64") ) && ( c("var/mullvad-browser") || c("var/nightly") ) %]'
|
|
|
12
|
+ linux-packages-aarch64: '[% c("var/browser_platforms/linux-aarch64") && (c("var/mullvad-browser") || c("var/nightly")) %]'
|
|
|
13
|
+
|
|
11
|
14
|
targets:
|
|
12
|
15
|
browser-all:
|
|
13
|
16
|
- browser-src
|
| ... |
... |
@@ -37,7 +40,6 @@ targets: |
|
37
|
40
|
var:
|
|
38
|
41
|
browser_platforms:
|
|
39
|
42
|
linux-x86_64: 1
|
|
40
|
|
- linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'
|
|
41
|
43
|
browser-linux-x86_64-asan:
|
|
42
|
44
|
var:
|
|
43
|
45
|
browser_platforms:
|
| ... |
... |
@@ -47,12 +49,10 @@ targets: |
|
47
|
49
|
var:
|
|
48
|
50
|
browser_platforms:
|
|
49
|
51
|
linux-i686: 1
|
|
50
|
|
- linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'
|
|
51
|
52
|
browser-linux-aarch64:
|
|
52
|
53
|
var:
|
|
53
|
54
|
browser_platforms:
|
|
54
|
55
|
linux-aarch64: 1
|
|
55
|
|
- linux-packages-aarch64: '[% (! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly")) && (c("var/mullvad-browser") || c("var/tor-browser-linux-packages")) %]'
|
|
56
|
56
|
browser-windows-i686:
|
|
57
|
57
|
var:
|
|
58
|
58
|
browser_platforms:
|
| ... |
... |
@@ -96,7 +96,6 @@ targets: |
|
96
|
96
|
var:
|
|
97
|
97
|
browser_type: torbrowser
|
|
98
|
98
|
git_tag_prefix: tbb
|
|
99
|
|
- tor-browser-linux-packages: '[% c("var/nightly") %]'
|
|
100
|
99
|
basebrowser:
|
|
101
|
100
|
var:
|
|
102
|
101
|
browser_type: basebrowser
|
| ... |
... |
@@ -201,13 +200,13 @@ input_files: |
|
201
|
200
|
|
|
202
|
201
|
- name: deb-packages
|
|
203
|
202
|
project: linux-packages
|
|
204
|
|
- enable: '[% c("var/browser_platforms/packages") %]'
|
|
|
203
|
+ enable: '[% c("var/linux-packages") %]'
|
|
205
|
204
|
# Add $browser_type-linux-x86_64 target for container config
|
|
206
|
205
|
target:
|
|
207
|
206
|
- '[% IF c("var/testbuild") %]testbuild[% END %]'
|
|
208
|
207
|
- '[% c("var/build_target") %]'
|
|
209
|
|
- - '[% IF c("var/browser-linux-i686") %]browser-linux-i686[% END %]'
|
|
210
|
|
- - '[% IF c("var/browser-linux-x86_64") %]browser-linux-x86_64[% END %]'
|
|
|
208
|
+ - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]'
|
|
|
209
|
+ - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]'
|
|
211
|
210
|
- deb
|
|
212
|
211
|
- '[% c("var/browser_type") %]-linux-x86_64'
|
|
213
|
212
|
|
| ... |
... |
@@ -231,8 +230,8 @@ input_files: |
|
231
|
230
|
target:
|
|
232
|
231
|
- '[% IF c("var/testbuild") %]testbuild[% END %]'
|
|
233
|
232
|
- '[% c("var/build_target") %]'
|
|
234
|
|
- - '[% IF c("var/browser-linux-i686") %]browser-linux-i686[% END %]'
|
|
235
|
|
- - '[% IF c("var/browser-linux-x86_64") %]browser-linux-x86_64[% END %]'
|
|
|
233
|
+ - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]'
|
|
|
234
|
+ - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]'
|
|
236
|
235
|
- '[% IF c("var/linux-packages-aarch64") %]browser-linux-aarch64[% END %]'
|
|
237
|
236
|
- rpm
|
|
238
|
237
|
- '[% c("var/browser_type") %]-linux-x86_64'
|