tbb-commits July 2022

tbb-commits@lists.torproject.org

2 participants
74 discussions

[builders/tor-browser-build] branch master updated (777416b -> d853ed9)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 777416b Bug 40547: Use container/remote_* from rbm new b1fcde0 Bug 40522: Add base-browser targets to rbm.conf new 70dc7d9 Bug 40501: Add base-browser support to projects/release/config new 543a473 Bug 40501: Rename Makefile build targets to torbrowser-* new 440faf0 Bug 40501: Add base-browser makefile targets new c52bc0e Bug 40500: Rename projects/tor-browser to projects/browser new efea360 Bug 40499: Update projects/firefox to build base-browser new 26589e0 Bug 40500: Include windows-installer in projects/browser/windows-installer new a61134f Bug 40500: Update projects/browser for base-browser new 0e1e8cf Bug 40500: Disable namecoin in base-browser new d853ed9 Bug 23656: Use mozconfig files from tor-browser.git to build firefox The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 408 +++++++++++++++------ README | 28 +- doc/HACKING.txt | 14 +- doc/MAKEFILE.txt | 60 +-- keyring/tbb-windows-installer.gpg | Bin 7231 -> 0 bytes .../Bundle-Data/Docs/ChangeLog.txt | 0 .../Bundle-Data/Docs/Licenses/Firefox.txt | 0 .../Bundle-Data/Docs/Licenses/HTTPS-Everywhere.txt | 0 .../Bundle-Data/Docs/Licenses/Libevent.txt | 0 .../Bundle-Data/Docs/Licenses/NoScript.txt | 0 .../Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt | 0 .../Bundle-Data/Docs/Licenses/Noto-Fonts.txt | 0 .../Docs/Licenses/PluggableTransports/LICENSE | 0 .../Docs/Licenses/PluggableTransports/LICENSE.CC0 | 0 .../Docs/Licenses/PluggableTransports/LICENSE.GO | 0 .../Licenses/PluggableTransports/LICENSE.SNOWFLAKE | 0 .../Bundle-Data/Docs/Licenses/Tor-Launcher.txt | 0 .../Bundle-Data/Docs/Licenses/Tor.txt | 0 .../Bundle-Data/Docs/Licenses/Torbutton.txt | 0 .../Bundle-Data/PTConfigs/bridge_prefs.js | 0 .../PTConfigs/linux/torrc-defaults-appendix | 0 .../PTConfigs/mac/torrc-defaults-appendix | 0 .../PTConfigs/windows/torrc-defaults-appendix | 0 .../Data/Browser/profile.default/bookmarks.html | 0 .../Bundle-Data/linux/Data/Browser/profiles.ini | 0 .../Bundle-Data/linux/Data/Electrum-NMC/config | 0 .../Bundle-Data/linux/Data/Tor/torrc | 0 .../Bundle-Data/linux/Data/Tor/torrc-defaults | 0 .../Bundle-Data/linux/Data/fontconfig/fonts.conf | 0 .../linux/Data/ncprop279/ncprop279.conf | 0 .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin .../mac-applications.dmg/.VolumeIcon.icns | Bin .../.background/background.tiff | Bin .../Bundle-Data/mac-applications.dmg/Applications | 0 .../Bundle-Data/mac-desktop.dmg/.DS_Store | Bin .../Bundle-Data/mac-desktop.dmg/._Desktop | Bin .../mac-desktop.dmg/.background/background.png | Bin .../Bundle-Data/mac-desktop.dmg/Desktop | Bin .../Bundle-Data/mac-tor.sh | 0 .../Data/Browser/profile.default/bookmarks.html | 0 .../mac/TorBrowser/Data/Browser/profiles.ini | 0 .../Bundle-Data/mac/TorBrowser/Data/Tor/torrc | 0 .../mac/TorBrowser/Data/Tor/torrc-defaults | 0 .../Data/Browser/profile.default/bookmarks.html | 0 .../Bundle-Data/windows/Data/Browser/profiles.ini | 0 .../Bundle-Data/windows/Data/Tor/torrc | 0 .../Bundle-Data/windows/Data/Tor/torrc-defaults | 0 .../RelativeLink/execdesktop | 2 +- .../RelativeLink/start-browser} | 86 ++--- .../browser/RelativeLink/start-browser.desktop | 34 ++ .../{tor-browser => browser}/allowed_addons.json | 0 .../{tor-browser => browser}/android-qa.keystore | Bin projects/{tor-browser => browser}/build | 204 ++++++----- projects/{tor-browser => browser}/build.android | 4 +- projects/{tor-browser => browser}/config | 29 +- projects/{tor-browser => browser}/ddmg.sh | 0 .../{tor-browser => browser}/gtk3-settings.ini | 0 .../how-to-generate-keystore.txt | 0 projects/{tor-browser => browser}/namecoin.patch | 0 .../{tor-browser => browser}/pe_checksum_fix.py | 4 +- projects/{tor-browser => browser}/run_scripts | 0 .../verify_allowed_addons.py | 0 projects/browser/windows-installer/basebrowser.ico | Bin 0 -> 23934 bytes projects/browser/windows-installer/basebrowser.nsi | 185 ++++++++++ projects/browser/windows-installer/torbrowser.ico | Bin 0 -> 23934 bytes projects/browser/windows-installer/torbrowser.nsi | 185 ++++++++++ projects/firefox/build | 39 +- projects/firefox/config | 12 +- projects/firefox/mozconfig | 68 ++++ projects/firefox/mozconfig-linux-i686 | 45 --- projects/firefox/mozconfig-linux-x86_64 | 44 --- projects/firefox/mozconfig-linux-x86_64-asan | 49 --- projects/firefox/mozconfig-osx-x86_64 | 53 --- projects/firefox/mozconfig-windows-i686 | 48 --- projects/firefox/mozconfig-windows-x86_64 | 48 --- projects/release/build | 28 +- projects/release/config | 194 +++++----- projects/tbb-windows-installer/build | 8 - projects/tbb-windows-installer/config | 7 - .../RelativeLink/start-tor-browser.desktop | 34 -- rbm.conf | 80 +++- 81 files changed, 1226 insertions(+), 774 deletions(-) delete mode 100644 keyring/tbb-windows-installer.gpg rename projects/{tor-browser => browser}/Bundle-Data/Docs/ChangeLog.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Firefox.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/HTTPS-Everywhere.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Libevent.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/NoScript.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Noto-Fonts.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.CC0 (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Tor-Launcher.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Tor.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/Docs/Licenses/Torbutton.txt (100%) rename projects/{tor-browser => browser}/Bundle-Data/PTConfigs/bridge_prefs.js (100%) rename projects/{tor-browser => browser}/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix (100%) rename projects/{tor-browser => browser}/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix (100%) rename projects/{tor-browser => browser}/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/Browser/profiles.ini (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/Electrum-NMC/config (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/Tor/torrc (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/Tor/torrc-defaults (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/fontconfig/fonts.conf (100%) rename projects/{tor-browser => browser}/Bundle-Data/linux/Data/ncprop279/ncprop279.conf (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-applications.dmg/.DS_Store (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-applications.dmg/.background/background.tiff (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-applications.dmg/Applications (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-desktop.dmg/.DS_Store (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-desktop.dmg/._Desktop (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-desktop.dmg/.background/background.png (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-desktop.dmg/Desktop (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac-tor.sh (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac/TorBrowser/Data/Browser/profiles.ini (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac/TorBrowser/Data/Tor/torrc (100%) rename projects/{tor-browser => browser}/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults (100%) rename projects/{tor-browser => browser}/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html (100%) rename projects/{tor-browser => browser}/Bundle-Data/windows/Data/Browser/profiles.ini (100%) rename projects/{tor-browser => browser}/Bundle-Data/windows/Data/Tor/torrc (100%) rename projects/{tor-browser => browser}/Bundle-Data/windows/Data/Tor/torrc-defaults (100%) rename projects/{tor-browser => browser}/RelativeLink/execdesktop (53%) rename projects/{tor-browser/RelativeLink/start-tor-browser => browser/RelativeLink/start-browser} (72%) create mode 100755 projects/browser/RelativeLink/start-browser.desktop rename projects/{tor-browser => browser}/allowed_addons.json (100%) rename projects/{tor-browser => browser}/android-qa.keystore (100%) rename projects/{tor-browser => browser}/build (64%) rename projects/{tor-browser => browser}/build.android (89%) rename projects/{tor-browser => browser}/config (81%) rename projects/{tor-browser => browser}/ddmg.sh (100%) rename projects/{tor-browser => browser}/gtk3-settings.ini (100%) rename projects/{tor-browser => browser}/how-to-generate-keystore.txt (100%) rename projects/{tor-browser => browser}/namecoin.patch (100%) rename projects/{tor-browser => browser}/pe_checksum_fix.py (96%) rename projects/{tor-browser => browser}/run_scripts (100%) rename projects/{tor-browser => browser}/verify_allowed_addons.py (100%) create mode 100644 projects/browser/windows-installer/basebrowser.ico create mode 100644 projects/browser/windows-installer/basebrowser.nsi create mode 100644 projects/browser/windows-installer/torbrowser.ico create mode 100644 projects/browser/windows-installer/torbrowser.nsi create mode 100755 projects/firefox/mozconfig delete mode 100755 projects/firefox/mozconfig-linux-i686 delete mode 100755 projects/firefox/mozconfig-linux-x86_64 delete mode 100644 projects/firefox/mozconfig-linux-x86_64-asan delete mode 100644 projects/firefox/mozconfig-osx-x86_64 delete mode 100644 projects/firefox/mozconfig-windows-i686 delete mode 100644 projects/firefox/mozconfig-windows-x86_64 delete mode 100644 projects/tbb-windows-installer/build delete mode 100644 projects/tbb-windows-installer/config delete mode 100755 projects/tor-browser/RelativeLink/start-tor-browser.desktop -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 10

[builders/rbm] branch main created (now e93302b)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository builders/rbm. at e93302b Bug 40029: Add default remote_* options for containers No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main created (now f3f6f08)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository tor-browser-spec. at f3f6f08 Bug 40032: Mention enabling/disabling networking on the `macos-signer` No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-bundle-testsuite] branch main created (now 6933288)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository tor-browser-bundle-testsuite. at 6933288 Bug 40045: Run static-update-component in rsync-to-tbb-nightlies-master No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-launcher] branch main created (now fe8022d)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository tor-launcher. at fe8022d Release preparations for 0.2.37 No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main created (now 27b24bcf)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository torbutton. at 27b24bcf fixup! Bug 40886: Amend about:tor on Nightly and Alpha to encourage testing No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main created (now 777416b)
by gitolite role 14 Jul '22

14 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository builders/tor-browser-build. at 777416b Bug 40547: Use container/remote_* from rbm No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40547: Use container/remote_* from rbm
by gitolite role 13 Jul '22

13 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 777416b Bug 40547: Use container/remote_* from rbm 777416b is described below commit 777416b741eac7ca6b297639e2232b12b12c892a Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Fri Jul 8 13:45:43 2022 +0200 Bug 40547: Use container/remote_* from rbm With rbm#40029, container/remote_* is now added directly to rbm, so we can remove it from rbm.conf. We also need to rename a few options: - var/container/use_container -> container/use_container - var/container/global_disable -> container/global_disable - var/container/disable_network -> container/disable_network - var/container/dir -> container/dir --- doc/how-to-create-gradle-dependencies-list.txt | 2 +- projects/agouti/config | 5 +- projects/aiohttp/config | 5 +- projects/aiohttp_socks/config | 5 +- projects/aiorpcx/config | 5 +- projects/android-components/config | 8 +-- projects/android-toolchain/config | 4 +- projects/application-services/config | 8 +-- projects/async_timeout/config | 5 +- projects/attr/config | 5 +- projects/binutils/config | 4 +- projects/cbindgen/config | 4 +- projects/cctools/config | 6 +- projects/certifi/config | 5 +- projects/chardet/config | 5 +- projects/clang/config | 4 +- projects/cmake/config | 5 +- projects/container-image/config | 5 +- projects/dns/config | 5 +- projects/ecdsa/config | 5 +- projects/edwards25519-extra/config | 4 +- projects/edwards25519/config | 4 +- projects/electrum-nmc/config | 5 +- projects/fenix/config | 9 ++- projects/firefox/config | 14 ++-- projects/fonts/config | 4 +- projects/fxc2/config | 4 +- projects/gcc/config | 4 +- projects/geckoview/config | 9 ++- projects/glean/config | 5 +- projects/go-difflib/config | 4 +- projects/go-spew/config | 4 +- projects/go/config | 4 +- projects/goansicolor/config | 5 +- projects/gobsaes/config | 4 +- projects/gobtcd/config | 5 +- projects/gobtcd2/config | 4 +- projects/gobtclog/config | 5 +- projects/gobtcutil/config | 5 +- projects/gobuildinfo/config | 5 +- projects/gocheck/config | 4 +- projects/gocompress/config | 4 +- projects/goconfigurable/config | 5 +- projects/godegoutils/config | 5 +- projects/godexlogconfig/config | 5 +- projects/godns/config | 5 +- projects/goeasyconfig/config | 5 +- projects/goerrors/config | 4 +- projects/gogroupcache/config | 5 +- projects/goisatty/config | 5 +- projects/gokingpin/config | 5 +- projects/gomadns/config | 5 +- projects/gomock/config | 4 +- projects/goncbtcjson/config | 5 +- projects/goncrpcclient/config | 5 +- projects/gopflag/config | 5 +- projects/gopretty/config | 5 +- projects/goptlib/config | 4 +- projects/goservice/config | 5 +- projects/gosocks/config | 5 +- projects/gosvcutils/config | 5 +- projects/gosystemd/config | 5 +- projects/gotemplate/config | 5 +- projects/gotext/config | 5 +- projects/gotoml/config | 5 +- projects/gounits/config | 5 +- projects/goutls/config | 4 +- projects/gowebsocket/config | 5 +- projects/goxcrypto/config | 4 +- projects/goxcryptoed25519/config | 4 +- projects/goxcryptoripemd160/config | 4 +- projects/goxlog/config | 5 +- projects/goxnet/config | 4 +- projects/goxnetip/config | 4 +- projects/goxsys/config | 4 +- projects/goxsysunix/config | 4 +- projects/goxtext/config | 4 +- projects/goxxerrors/config | 4 +- projects/goyaml/config | 4 +- projects/gradle/config | 4 +- projects/https-everywhere/config | 3 +- projects/idna/config | 5 +- projects/idna_ssl/config | 5 +- projects/jsonrpclib/config | 5 +- projects/kcp-go/config | 5 +- projects/libdmg-hfsplus/config | 4 +- projects/libevent/config | 4 +- projects/libtapi/config | 5 +- projects/lucetc/config | 5 +- projects/macosx-toolchain/config | 4 +- projects/manual/config | 4 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 4 +- projects/mmdebstrap-image/config | 5 +- projects/multidict/config | 5 +- projects/nasm/config | 5 +- projects/ncdns/config | 5 +- projects/ncprop279/config | 5 +- projects/ninja/config | 5 +- projects/node/config | 4 +- projects/nsis/config | 4 +- projects/nss/config | 4 +- projects/obfs4/config | 5 +- projects/objx/config | 4 +- projects/openssl/config | 4 +- projects/osslsigncode/config | 4 +- projects/pion-datachannel/config | 4 +- projects/pion-dtls/config | 4 +- projects/pion-ice/config | 4 +- projects/pion-interceptor/config | 4 +- projects/pion-logging/config | 4 +- projects/pion-mdns/config | 4 +- projects/pion-randutil/config | 4 +- projects/pion-rtcp/config | 4 +- projects/pion-rtp/config | 4 +- projects/pion-sctp/config | 4 +- projects/pion-sdp/config | 4 +- projects/pion-srtp/config | 4 +- projects/pion-stun/config | 4 +- projects/pion-transport/config | 4 +- projects/pion-turn/config | 4 +- projects/pion-udp/config | 4 +- projects/pion-webrtc/config | 4 +- projects/pretty/config | 4 +- projects/pty/config | 4 +- projects/pyaes/config | 5 +- projects/python/config | 4 +- projects/rust/config | 4 +- projects/siphash/config | 4 +- projects/six/config | 5 +- projects/smux/config | 5 +- projects/snowflake/config | 5 +- projects/sqlcipher/config | 4 +- projects/stemns/config | 4 +- projects/testify/config | 4 +- projects/text/config | 4 +- projects/tor-android-service/config | 4 +- projects/tor-browser/config | 4 +- projects/tor-launcher/config | 10 ++- projects/tor-onion-proxy-library/config | 4 +- projects/tor/config | 4 +- projects/typing_extensions/config | 5 +- projects/uniffi-rs/config | 5 +- projects/uuid/config | 4 +- projects/wasi-sysroot/config | 5 +- projects/yarl/config | 5 +- projects/zlib/config | 4 +- projects/zstd/config | 5 +- rbm | 2 +- rbm.conf | 97 ++++---------------------- 150 files changed, 358 insertions(+), 430 deletions(-) diff --git a/doc/how-to-create-gradle-dependencies-list.txt b/doc/how-to-create-gradle-dependencies-list.txt index b233eec..31fef73 100644 --- a/doc/how-to-create-gradle-dependencies-list.txt +++ b/doc/how-to-create-gradle-dependencies-list.txt @@ -47,7 +47,7 @@ Otherwise, when calling gradle in the project's build script replace the `--offline` flag with `--debug` and remove any `-Dmaven.repo.local` arguments. Finally, allow network access during the build by setting -`var/container/disable_network/build` to `0` in rbm.conf, and rerun the build. +`container/disable_network/build` to `0` in rbm.conf, and rerun the build. Dependent artifacts will show up as downloads in the logs. You can pull out these dependencies into a list by passing the log file to the gradle dependency diff --git a/projects/agouti/config b/projects/agouti/config index 086aa86..badab09 100644 --- a/projects/agouti/config +++ b/projects/agouti/config @@ -6,9 +6,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil build: '[% c("projects/go/var/build_go_lib") %]' +container: + use_container: 1 + var: - container: - use_container: 1 go_lib: github.com/sclevine/agouti input_files: diff --git a/projects/aiohttp/config b/projects/aiohttp/config index 79f8f64..54a632d 100644 --- a/projects/aiohttp/config +++ b/projects/aiohttp/config @@ -4,8 +4,7 @@ git_url: https://github.com/aio-libs/aiohttp.git git_hash: f6f647eb828fa738610d61481f11fa51e42599e9 # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/aiohttp_socks/config b/projects/aiohttp_socks/config index 3e24f2f..c389472 100644 --- a/projects/aiohttp_socks/config +++ b/projects/aiohttp_socks/config @@ -4,8 +4,7 @@ git_url: https://github.com/romis2012/aiohttp-socks.git git_hash: 3252f4bdd37fb9a7360481977f800189cb3e3aca # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/aiorpcx/config b/projects/aiorpcx/config index fd8eb5a..35047de 100644 --- a/projects/aiorpcx/config +++ b/projects/aiorpcx/config @@ -4,8 +4,7 @@ git_url: https://github.com/kyuupichan/aiorpcX.git git_hash: 4f39366e5dee3fd0a857e53f383c628807cd2715 # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/android-components/config b/projects/android-components/config index 8bcb4c5..8d4b39a 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -6,12 +6,12 @@ git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' +container: + use_container: 1 var: android_components_version: 99.0.3 torbrowser_branch: 11.5 - container: - use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 35 gradle_version: 7.0.2 @@ -62,9 +62,9 @@ steps: git_url: https://github.com/mozilla-mobile/android-components.git git_hash: releases/99.0 #tag_gpg_id: 0 + container: + use_container: 0 var: - container: - use_container: 0 get_glean_version: | #!/bin/bash read -d '' p << 'EOF' || true diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index bcb33ca..57c38c1 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]+[% c("var/version_31") %]' +container: + use_container: 1 var: version_31: 31.0.0 version_30: 30.0.2 version_29: 29.0.2 version_28: 28.0.3 - container: - use_container: 1 deps: - unzip - python3 diff --git a/projects/application-services/config b/projects/application-services/config index d65014f..4e7427c 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -4,10 +4,10 @@ version: 91.1.1 git_hash: 17942945873cdb8be56a9316d3cb8a611b3ef321 git_url: https://github.com/mozilla/application-services git_submodule: 1 +container: + use_container: 1 var: - container: - use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 9 gradle_version: 6.7.1 @@ -104,9 +104,9 @@ steps: list_toolchain_updates: git_hash: 'v91.1.0' input_files: [] + container: + use_container: 0 var: - container: - use_container: 0 get_android_components_version: | #!/bin/bash read -d '' p << 'EOF' || true diff --git a/projects/async_timeout/config b/projects/async_timeout/config index 1e0faa7..e64af0f 100644 --- a/projects/async_timeout/config +++ b/projects/async_timeout/config @@ -4,8 +4,7 @@ git_url: https://github.com/aio-libs/async-timeout.git git_hash: 992fd174a5282258228b74127914f4b8135bf30a # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/attr/config b/projects/attr/config index bf62203..b7360de 100644 --- a/projects/attr/config +++ b/projects/attr/config @@ -4,8 +4,7 @@ git_url: https://github.com/python-attrs/attrs.git git_hash: 0356f0603eb5d8d4e7bae132ab80847fff4abcfc # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/binutils/config b/projects/binutils/config index 7eb4ac6..c8de80a 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,10 +1,10 @@ # vim: filetype=yaml sw=2 version: 2.35.2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' - container: - use_container: 1 targets: windows: diff --git a/projects/cbindgen/config b/projects/cbindgen/config index ec44731..65c77e4 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -3,14 +3,14 @@ version: '[% c("var/cbindgen_version") %]' git_url: https://github.com/eqrion/cbindgen git_hash: '[% c("var/cbindgen_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: cbindgen_version: 0.19.0 cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2 cbindgen_vendor_hash: 7d99c195b180e28ca7499d8744d020b864f952a5ba699716707aec9a06b4ee8b cbindgen_vendor_people_tpo_user: boklm - container: - use_container: 1 input_files: - project: container-image diff --git a/projects/cctools/config b/projects/cctools/config index 2725cfe..6ea60d9 100644 --- a/projects/cctools/config +++ b/projects/cctools/config @@ -5,10 +5,8 @@ version: '[% c("abbrev") %]' # taskcluster/ci/fetch/toolchains.yml git_hash: 30518813875aed656aa7f18b6d485feee25f8f87 git_url: https://github.com/tpoechtrager/cctools-port - -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/certifi/config b/projects/certifi/config index cd1120d..6741312 100644 --- a/projects/certifi/config +++ b/projects/certifi/config @@ -1,9 +1,8 @@ # vim: filetype=yaml sw=2 version: 2019.3.9 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/chardet/config b/projects/chardet/config index 94884fb..986a587 100644 --- a/projects/chardet/config +++ b/projects/chardet/config @@ -4,8 +4,7 @@ git_url: https://github.com/chardet/chardet.git git_hash: 9b8c5c2fb118d76c6beeab9affd01c332732a530 # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/clang/config b/projects/clang/config index 0524420..a692a30 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -1,11 +1,11 @@ # vim: filetype=yaml sw=2 version: '[% c("var/llvm_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: llvm_version: '[% pc("llvm-project", "version") %]' - container: - use_container: 1 input_files: - project: container-image diff --git a/projects/cmake/config b/projects/cmake/config index 28afa05..0f931be 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -5,9 +5,8 @@ git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: cmake.gpg filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/container-image/config b/projects/container-image/config index 2d89444..062cafc 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -1,10 +1,11 @@ # vim: filetype=yaml sw=2 filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %]-[% sha256(c("pre")).substr(0, 12) %].tar.gz' pkg_type: build +container: + use_container: 1 var: container: - use_container: 1 suite: '[% pc(c("origin_project"), "var/container/suite", { step => c("origin_step") }) %]' arch: '[% pc(c("origin_project"), "var/container/arch", { step => c("origin_step") }) %]' @@ -74,7 +75,7 @@ remote_get: | SET dst = shell_quote(c('get_dst', { error_if_undef => 1 })); -%] mkdir -p "[% dst %]" - [% c("rbmdir") %]/container archive '[% c("var/container/dir") %]' "[% dst %]/[% c("filename") %]" + [% c("rbmdir") %]/container archive '[% c("container/dir") %]' "[% dst %]/[% c("filename") %]" input_files: - project: mmdebstrap-image diff --git a/projects/dns/config b/projects/dns/config index e18fc85..3dae574 100644 --- a/projects/dns/config +++ b/projects/dns/config @@ -1,9 +1,8 @@ # vim: filetype=yaml sw=2 version: 1.16.0 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image - URL: https://files.pythonhosted.org/packages/source/d/dnspython/dnspython-[% c("version") %].zip diff --git a/projects/ecdsa/config b/projects/ecdsa/config index e4ee567..33a7852 100644 --- a/projects/ecdsa/config +++ b/projects/ecdsa/config @@ -4,8 +4,7 @@ git_url: https://github.com/warner/python-ecdsa.git git_hash: bb359d32e93acc3eb4d216aff4ba0e7531599cfb # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/edwards25519-extra/config b/projects/edwards25519-extra/config index 2aa7390..4c36a04 100644 --- a/projects/edwards25519-extra/config +++ b/projects/edwards25519-extra/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://gitlab.com/yawning/edwards25519-extra.git git_hash: 2f91fcc9fbdb888f3c795849b6777940135559b7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gitlab.com/yawning/edwards25519-extra.git go_lib_deps: - goxcrypto diff --git a/projects/edwards25519/config b/projects/edwards25519/config index 0f3377d..28134cd 100644 --- a/projects/edwards25519/config +++ b/projects/edwards25519/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/FiloSottile/edwards25519.git git_hash: 390f27c3be2014e4912ce88c6a1fff52ec60428b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: filippo.io/edwards25519 input_files: diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 66be513..eb21d0e 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -4,9 +4,8 @@ version: 3.3.11 git_url: https://github.com/namecoin/electrum-nmc.git git_hash: dc366a9cfedac24c0fd12d493f25ed058cf38271 # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/fenix/config b/projects/fenix/config index f193de4..b478d84 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -6,14 +6,14 @@ git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg variant: Beta +container: + use_container: 1 var: fenix_version: 99.0.0b3 torbrowser_branch: 11.5 git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' - container: - use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 35 gradle_version: 7.0.2 @@ -66,9 +66,8 @@ steps: git_hash: releases_v99.0.0 #tag_gpg_id: 0 input_files: [] - var: - container: - use_container: 0 + container: + use_container: 0 get_gradle_dependencies_list: git_hash: '[% c("var/git_branch") %]^{/Add Tor integration and UI}' diff --git a/projects/firefox/config b/projects/firefox/config index 3b38c83..616cb94 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -6,6 +6,8 @@ tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg +container: + use_container: 1 var: firefox_platform_version: 91.10.0 @@ -20,8 +22,6 @@ var: - autoconf2.13 - yasm - pkg-config - container: - use_container: 1 rezip: | rezip_tmpdir=$(mktemp -d) @@ -41,9 +41,8 @@ steps: filename: 'src-[% project %]-[% c("version") %].tar.xz' version: '[% c("git_hash") %]' input_files: [] - var: - container: - use_container: 0 + container: + use_container: 0 targets: nightly: version: '[% c("abbrev") %]' @@ -53,9 +52,8 @@ steps: git_hash: esr91 tag_gpg_id: 0 input_files: [] - var: - container: - use_container: 0 + container: + use_container: 0 targets: release: diff --git a/projects/fonts/config b/projects/fonts/config index ce66556..0ae75cd 100644 --- a/projects/fonts/config +++ b/projects/fonts/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 version: '2' filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" +container: + use_container: 1 var: - container: - use_container: 1 noto_git_hash: 20bc5918912503bc1537a407a694738c33c048aa # Use this way so that the script that downloads the fonts can access the # lists of all the targets. diff --git a/projects/fxc2/config b/projects/fxc2/config index d1620d9..735497b 100644 --- a/projects/fxc2/config +++ b/projects/fxc2/config @@ -3,10 +3,10 @@ version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/fxc2.git git_hash: 5ace4c25b63cb5a83b58a3eae3d36256a6022cde filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 compiler: mingw-w64-clang input_files: diff --git a/projects/gcc/config b/projects/gcc/config index b8ab369..7bd7ccd 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -4,9 +4,9 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' # ABI change we should also update projects/firefox/abicheck.cc to # require the new version. version: 10.3.0 +container: + use_container: 1 var: - container: - use_container: 1 deps: - build-essential - libmpc-dev diff --git a/projects/geckoview/config b/projects/geckoview/config index 8255944..bd0aed9 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -6,6 +6,8 @@ tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg +container: + use_container: 1 var: geckoview_version: 99.0b3 @@ -21,8 +23,6 @@ var: - python3-distutils - pkg-config - openjdk-11-jdk-headless - container: - use_container: 1 # this should be updated when the list of gradle dependencies is changed # see doc/how-to-create-gradle-dependencies-list.txt gradle_dependencies_version: 10 @@ -140,9 +140,8 @@ steps: git_hash: beta tag_gpg_id: 0 input_files: [] - var: - container: - use_container: 0 + container: + use_container: 0 targets: nightly: diff --git a/projects/glean/config b/projects/glean/config index e65e28f..02d9ef6 100644 --- a/projects/glean/config +++ b/projects/glean/config @@ -37,9 +37,8 @@ steps: version: 5.0.1 filename: 'glean-wheels-[% c("version") %].tar.xz' build_log: '-' - var: - container: - use_container: 1 + container: + use_container: 1 create_glean_deps_tarball: | #!/bin/bash [% c("var/set_default_env") -%] diff --git a/projects/go-difflib/config b/projects/go-difflib/config index e8d34df..eb76802 100644 --- a/projects/go-difflib/config +++ b/projects/go-difflib/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pmezard/go-difflib git_hash: 792786c7400a136282c1664665ae0a8db921c6c2 # v1.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pmezard/go-difflib go_lib_install: - github.com/pmezard/go-difflib/difflib diff --git a/projects/go-spew/config b/projects/go-spew/config index 946fb96..fdde571 100644 --- a/projects/go-spew/config +++ b/projects/go-spew/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/davecgh/go-spew git_hash: 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/davecgh/go-spew go_lib_install: - github.com/davecgh/go-spew/spew diff --git a/projects/go/config b/projects/go/config index a043bda..da083f2 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,11 +1,11 @@ # vim: filetype=yaml sw=2 version: 1.17.11 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: go14_version: 1.4.3 - container: - use_container: 1 setup: | mkdir -p /var/tmp/dist diff --git a/projects/goansicolor/config b/projects/goansicolor/config index 6d1a73e..68b1032 100644 --- a/projects/goansicolor/config +++ b/projects/goansicolor/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/shiena/ansicolor.git git_hash: a422bbe96644373c5753384a59d678f7d261ff10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: +use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/shiena/ansicolor input_files: diff --git a/projects/gobsaes/config b/projects/gobsaes/config index cd8af1a..a3d2b28 100644 --- a/projects/gobsaes/config +++ b/projects/gobsaes/config @@ -3,12 +3,12 @@ git_url: https://gitlab.com/yawning/bsaes.git version: '[% c("abbrev") %]' git_hash: 0a714cd429ec754482b4001e918db30cd2094405 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gitlab.com/yawning/bsaes.git go_lib_deps: - goxsys diff --git a/projects/gobtcd/config b/projects/gobtcd/config index 56dcca4..f2f33ec 100644 --- a/projects/gobtcd/config +++ b/projects/gobtcd/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/namecoin/btcd.git git_hash: 6cfad711d4ee7367b3ab9dc572097438dbca56eb filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/namecoin/btcd go_lib_install: - github.com/namecoin/btcd/btcjson diff --git a/projects/gobtcd2/config b/projects/gobtcd2/config index 5324737..9d2c048 100644 --- a/projects/gobtcd2/config +++ b/projects/gobtcd2/config @@ -13,12 +13,12 @@ version: '[% c("abbrev") %]' git_url: '[% pc("gobtcd", "git_url") %]' git_hash: '[% pc("gobtcd", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/btcsuite/btcd go_lib_install: - github.com/btcsuite/btcd/btcec diff --git a/projects/gobtclog/config b/projects/gobtclog/config index 9fcb6c6..edf8540 100644 --- a/projects/gobtclog/config +++ b/projects/gobtclog/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/btcsuite/btclog.git git_hash: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/btcsuite/btclog input_files: diff --git a/projects/gobtcutil/config b/projects/gobtcutil/config index 63a8f90..97b4182 100644 --- a/projects/gobtcutil/config +++ b/projects/gobtcutil/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/btcsuite/btcutil.git git_hash: 9e5f4b9a998d263e3ce9c56664a7816001ac8000 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/btcsuite/btcutil go_lib_deps: - gobtcd2 diff --git a/projects/gobuildinfo/config b/projects/gobuildinfo/config index 5ca103c..6ff2a75 100644 --- a/projects/gobuildinfo/config +++ b/projects/gobuildinfo/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/buildinfo.git git_hash: 337a29b5499734e584d4630ce535af64c5fe7813 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/hlandau/buildinfo go_lib_deps: - goeasyconfig diff --git a/projects/gocheck/config b/projects/gocheck/config index bc71d01..abc7b55 100644 --- a/projects/gocheck/config +++ b/projects/gocheck/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://gopkg.in/check.v1 git_hash: 41f04d3bba152ddec2103e299fed053415705330 # v1.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/check.v1 go_lib_deps: - pretty diff --git a/projects/gocompress/config b/projects/gocompress/config index c675362..799c6b6 100644 --- a/projects/gocompress/config +++ b/projects/gocompress/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/dsnet/compress git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/dsnet/compress input_files: diff --git a/projects/goconfigurable/config b/projects/goconfigurable/config index 07bace5..e775153 100644 --- a/projects/goconfigurable/config +++ b/projects/goconfigurable/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/configurable.git git_hash: 34642c4c8cbf56801d0e34f0e82187305983ac26 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/hlandau/configurable.v1 input_files: diff --git a/projects/godegoutils/config b/projects/godegoutils/config index f4f380a..dbc977f 100644 --- a/projects/godegoutils/config +++ b/projects/godegoutils/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/degoutils.git git_hash: 8fa2440b63444dad556d76366f1c3ee070c8a577 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/hlandau/degoutils go_lib_install: - github.com/hlandau/degoutils/net diff --git a/projects/godexlogconfig/config b/projects/godexlogconfig/config index 0dccbe2..50ada8c 100644 --- a/projects/godexlogconfig/config +++ b/projects/godexlogconfig/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/dexlogconfig.git git_hash: 244f29bd260884993b176cd14ef2f7631f6f3c18 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/hlandau/dexlogconfig go_lib_deps: - gobuildinfo diff --git a/projects/godns/config b/projects/godns/config index a005c32..8cf8806 100644 --- a/projects/godns/config +++ b/projects/godns/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 1.1.22 git_url: https://github.com/miekg/dns.git git_hash: 1e224ff5dead8366ed6fcdcb832794be42e73f0e filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/miekg/dns go_lib_deps: - goxcryptoed25519 diff --git a/projects/goeasyconfig/config b/projects/goeasyconfig/config index a87283e..25ef3be 100644 --- a/projects/goeasyconfig/config +++ b/projects/goeasyconfig/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 1.0.17 git_url: https://github.com/hlandau/easyconfig.git git_hash: c31249162931b4963bbe6e501cccb60d23271a3f filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/hlandau/easyconfig.v1 go_lib_deps: - goconfigurable diff --git a/projects/goerrors/config b/projects/goerrors/config index 626f7d5..0ad8155 100644 --- a/projects/goerrors/config +++ b/projects/goerrors/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pkg/errors git_hash: 614d223910a179a466c1767a985424175c39b465 # v0.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pkg/errors input_files: diff --git a/projects/gogroupcache/config b/projects/gogroupcache/config index 5646737..2287d63 100644 --- a/projects/gogroupcache/config +++ b/projects/gogroupcache/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/golang/groupcache.git git_hash: 611e8accdfc92c4187d399e95ce826046d4c8d73 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/golang/groupcache go_lib_install: - github.com/golang/groupcache/lru diff --git a/projects/goisatty/config b/projects/goisatty/config index 0f5fc17..84e0887 100644 --- a/projects/goisatty/config +++ b/projects/goisatty/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 0.0.10 git_url: https://github.com/mattn/go-isatty.git git_hash: 88ba11cfdc67c7588b30042edf244b2875f892b6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/mattn/go-isatty go_lib_deps: - goxsysunix diff --git a/projects/gokingpin/config b/projects/gokingpin/config index dd209f4..3ac50cd 100644 --- a/projects/gokingpin/config +++ b/projects/gokingpin/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 2.2.6 git_url: https://github.com/alecthomas/kingpin.git git_hash: 947dcec5ba9c011838740e680966fd7087a71d0d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/alecthomas/kingpin.v2 go_lib_deps: - gotemplate diff --git a/projects/gomadns/config b/projects/gomadns/config index a53f410..cf37420 100644 --- a/projects/gomadns/config +++ b/projects/gomadns/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 2.0.1 git_url: https://github.com/hlandau/madns.git git_hash: 26979b3e4b5aa3e0bd53cf0a014f9eaf43b578e3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/hlandau/madns.v2 go_lib_deps: - godns diff --git a/projects/gomock/config b/projects/gomock/config index 53229ac..97a656e 100644 --- a/projects/gomock/config +++ b/projects/gomock/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/golang/mock git_hash: 51421b967af1f557f93a59e0057aaf15ca02e29c # v1.2.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/golang/mock go_lib_install: - github.com/golang/mock/gomock diff --git a/projects/goncbtcjson/config b/projects/goncbtcjson/config index 708bfc8..e14f98c 100644 --- a/projects/goncbtcjson/config +++ b/projects/goncbtcjson/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/namecoin/ncbtcjson.git git_hash: 0d2f400334751d149ca21bfd4535c9d2274f7264 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/namecoin/ncbtcjson go_lib_deps: - gobtcd diff --git a/projects/goncrpcclient/config b/projects/goncrpcclient/config index 122700c..99b39cb 100644 --- a/projects/goncrpcclient/config +++ b/projects/goncrpcclient/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/namecoin/ncrpcclient.git git_hash: 858e1a5acd8b2da56462f50323633cdf2fe80977 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/namecoin/ncrpcclient go_lib_deps: - gobtcd diff --git a/projects/gopflag/config b/projects/gopflag/config index 16141cc..2d7c495 100644 --- a/projects/gopflag/config +++ b/projects/gopflag/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/ogier/pflag.git git_hash: 45c278ab3607870051a2ea9040bb85fcb8557481 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/ogier/pflag input_files: diff --git a/projects/gopretty/config b/projects/gopretty/config index a2ceecf..f4bf681 100644 --- a/projects/gopretty/config +++ b/projects/gopretty/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/kr/pretty.git git_hash: 71e7e49937503c662b9b636fd6b2c14b1aa818a5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/kr/pretty go_lib_deps: - gotext diff --git a/projects/goptlib/config b/projects/goptlib/config index 1619ff3..0bd25e8 100644 --- a/projects/goptlib/config +++ b/projects/goptlib/config @@ -5,12 +5,12 @@ git_hash: '[% c("version") %]' tag_gpg_id: 1 gpg_keyring: goptlib.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: git.torproject.org/pluggable-transports/goptlib.git targets: diff --git a/projects/goservice/config b/projects/goservice/config index 67eff54..9aff8eb 100644 --- a/projects/goservice/config +++ b/projects/goservice/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/service.git git_hash: 0496f910e39ef577ba805f512f6e1b80d652c4b9 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/hlandau/service.v2 go_lib_deps: - gosvcutils diff --git a/projects/gosocks/config b/projects/gosocks/config index 1d9a5a8..016c1f9 100644 --- a/projects/gosocks/config +++ b/projects/gosocks/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/btcsuite/go-socks.git git_hash: 4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/btcsuite/go-socks go_lib_install: - github.com/btcsuite/go-socks/socks diff --git a/projects/gosvcutils/config b/projects/gosvcutils/config index b941e05..e5b1106 100644 --- a/projects/gosvcutils/config +++ b/projects/gosvcutils/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 1.0.10 git_url: https://github.com/hlandau/svcutils.git git_hash: c25dac49e50cbbcbef8c81b089f56156f4067729 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/hlandau/svcutils.v1 go_lib_install: - gopkg.in/hlandau/svcutils.v1 diff --git a/projects/gosystemd/config b/projects/gosystemd/config index daa9f79..803d3b7 100644 --- a/projects/gosystemd/config +++ b/projects/gosystemd/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 21 git_url: https://github.com/coreos/go-systemd.git git_hash: d3cd4ed1dbcf5835feba465b180436db54f20228 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/coreos/go-systemd go_lib_install: - github.com/coreos/go-systemd/journal diff --git a/projects/gotemplate/config b/projects/gotemplate/config index 62cddc9..1af8cda 100644 --- a/projects/gotemplate/config +++ b/projects/gotemplate/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/alecthomas/template.git git_hash: fb15b899a75114aa79cc930e33c46b577cc664b1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/alecthomas/template input_files: diff --git a/projects/gotext/config b/projects/gotext/config index 5493329..43f0e8d 100644 --- a/projects/gotext/config +++ b/projects/gotext/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 0.1.0 git_url: https://github.com/kr/text.git git_hash: e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/kr/text input_files: diff --git a/projects/gotoml/config b/projects/gotoml/config index c40c582..a401dbb 100644 --- a/projects/gotoml/config +++ b/projects/gotoml/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/BurntSushi/toml.git git_hash: 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/BurntSushi/toml input_files: diff --git a/projects/gounits/config b/projects/gounits/config index 8cf7395..3af8540 100644 --- a/projects/gounits/config +++ b/projects/gounits/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/alecthomas/units.git git_hash: f65c72e2690dc4b403c8bd637baf4611cd4c069b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/alecthomas/units input_files: diff --git a/projects/goutls/config b/projects/goutls/config index 8052176..91df0b7 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -5,12 +5,12 @@ git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: yawning.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gitlab.com/yawning/utls.git go_lib_deps: - goxcrypto diff --git a/projects/gowebsocket/config b/projects/gowebsocket/config index 1e103d3..5b27cd4 100644 --- a/projects/gowebsocket/config +++ b/projects/gowebsocket/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/btcsuite/websocket.git git_hash: 31079b6807923eb23992c421b114992b95131b55 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/btcsuite/websocket input_files: diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 1e23034..036cc86 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/crypto go_lib_install: - golang.org/x/crypto/chacha20poly1305 diff --git a/projects/goxcryptoed25519/config b/projects/goxcryptoed25519/config index d065de1..fd8d475 100644 --- a/projects/goxcryptoed25519/config +++ b/projects/goxcryptoed25519/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: '[% pc("goxcrypto", "git_url") %]' git_hash: '[% pc("goxcrypto", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/crypto go_lib_install: - golang.org/x/crypto/ed25519 diff --git a/projects/goxcryptoripemd160/config b/projects/goxcryptoripemd160/config index b14e71d..a3642c4 100644 --- a/projects/goxcryptoripemd160/config +++ b/projects/goxcryptoripemd160/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: '[% pc("goxcrypto", "git_url") %]' git_hash: '[% pc("goxcrypto", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/crypto go_lib_install: - golang.org/x/crypto/ripemd160 diff --git a/projects/goxlog/config b/projects/goxlog/config index fa47d30..6c1e149 100644 --- a/projects/goxlog/config +++ b/projects/goxlog/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: 1.0.0 git_url: https://github.com/hlandau/xlog.git git_hash: 197ef798aed28e08ed3e176e678fda81be993a31 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/hlandau/xlog go_lib_deps: - goisatty diff --git a/projects/goxnet/config b/projects/goxnet/config index 7656795..77813dd 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/net go_lib_install: - golang.org/x/net/ipv4 diff --git a/projects/goxnetip/config b/projects/goxnetip/config index db1c85e..c8005ae 100644 --- a/projects/goxnetip/config +++ b/projects/goxnetip/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: '[% pc("goxnet", "git_url") %]' git_hash: '[% pc("goxnet", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/net go_lib_install: - golang.org/x/net/ipv4 diff --git a/projects/goxsys/config b/projects/goxsys/config index 9f02aef..470cf61 100644 --- a/projects/goxsys/config +++ b/projects/goxsys/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/golang/sys git_hash: fae7ac547cb717d141c433a2a173315e216b64c4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/sys go_lib_install: - golang.org/x/sys/cpu diff --git a/projects/goxsysunix/config b/projects/goxsysunix/config index a2fe03c..be7fe34 100644 --- a/projects/goxsysunix/config +++ b/projects/goxsysunix/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: '[% pc("goxsys", "git_url") %]' git_hash: '[% pc("goxsys", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/sys go_lib_install: - golang.org/x/sys/unix diff --git a/projects/goxtext/config b/projects/goxtext/config index ddd333c..9563c87 100644 --- a/projects/goxtext/config +++ b/projects/goxtext/config @@ -4,12 +4,12 @@ git_url: https://github.com/golang/text # v0.3.3 git_hash: 23ae387dee1f90d29a23c0e87ee0b46038fbed0e filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/text input_files: diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config index 5c1b379..55d91fa 100644 --- a/projects/goxxerrors/config +++ b/projects/goxxerrors/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/xerrors git_hash: 5ec99f83aff198f5fbd629d6c8d8eb38a04218ca filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: golang.org/x/xerrors input_files: diff --git a/projects/goyaml/config b/projects/goyaml/config index f893dc2..6d12215 100644 --- a/projects/goyaml/config +++ b/projects/goyaml/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://gopkg.in/yaml.v3 git_hash: 9f266ea9e77c4c7aab4cf02650570e7c7b3031a5 # v3.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: gopkg.in/yaml.v3 go_lib_deps: - gocheck diff --git a/projects/gradle/config b/projects/gradle/config index 9e46681..5a63716 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -1,10 +1,10 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %].tar.gz' version: '[% pc(c("origin_project"), "var/gradle_version", { error_if_undef => 1 }) %]' +container: + use_container: 1 var: - container: - use_container: 1 deps: - unzip gradle_sha256sum: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 9af5ff6..e980cf3 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -6,6 +6,8 @@ git_submodule: 1 gpg_keyring: https-everywhere.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" +container: + use_container: 1 var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images @@ -16,7 +18,6 @@ var: # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: - use_container: 1 suite: bullseye arch: amd64 deps: diff --git a/projects/idna/config b/projects/idna/config index c499a80..5b60819 100644 --- a/projects/idna/config +++ b/projects/idna/config @@ -4,8 +4,7 @@ git_url: https://github.com/kjd/idna.git git_hash: 1cdf175e259b299be76f49c3ddc8794214f9931f # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/idna_ssl/config b/projects/idna_ssl/config index 7331027..bec3164 100644 --- a/projects/idna_ssl/config +++ b/projects/idna_ssl/config @@ -4,8 +4,7 @@ git_url: https://github.com/aio-libs/idna-ssl.git git_hash: 1ab8304810f8bd9a880c0a013276cddd3c6e9551 # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/jsonrpclib/config b/projects/jsonrpclib/config index e5b469b..d6a0d0a 100644 --- a/projects/jsonrpclib/config +++ b/projects/jsonrpclib/config @@ -4,8 +4,7 @@ git_url: https://github.com/tcalmant/jsonrpclib.git git_hash: fe9fcf2c99973507f7055d6c9e05e155957c2549 # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/kcp-go/config b/projects/kcp-go/config index 7551a5e..106e153 100644 --- a/projects/kcp-go/config +++ b/projects/kcp-go/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/xtaci/kcp-go git_hash: 831b5b267373f6fbd3548849a3925c4e70806de2 # v5.5.11 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/xtaci/kcp-go go_lib_deps: - goerrors diff --git a/projects/libdmg-hfsplus/config b/projects/libdmg-hfsplus/config index 67e8287..0013840 100644 --- a/projects/libdmg-hfsplus/config +++ b/projects/libdmg-hfsplus/config @@ -3,9 +3,9 @@ version: '[% c("abbrev") %]' git_url: https://github.com/vasi/libdmg-hfsplus git_hash: dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 deps: - build-essential - cmake diff --git a/projects/libevent/config b/projects/libevent/config index f7209d2..9afb920 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -5,10 +5,10 @@ git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 gpg_keyring: libevent.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 configure_opt_project: --disable-static targets: diff --git a/projects/libtapi/config b/projects/libtapi/config index 17aaac3..43f0c3a 100644 --- a/projects/libtapi/config +++ b/projects/libtapi/config @@ -6,9 +6,8 @@ version: '[% c("abbrev") %]' git_hash: b4f141a16c7c82f75973429c92242a8c7de3ddb1 git_url: https://github.com/tpoechtrager/apple-libtapi -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/lucetc/config b/projects/lucetc/config index f2d556c..4da651e 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -5,9 +5,8 @@ git_hash: d582d76bf0d17984501f3933688bf7a1eb5cf208 git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ git_submodule: 1 -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index b42d190..0afe1d9 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-1-[% c("var/build_id") %].tar.gz' version: 10.12 +container: + use_container: 1 var: - container: - use_container: 1 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] diff --git a/projects/manual/config b/projects/manual/config index fa01356..890bfab 100644 --- a/projects/manual/config +++ b/projects/manual/config @@ -1,10 +1,12 @@ +# vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt version: 40628 filename: 'manual-[% c("version") %].tar.gz' +container: + use_container: 1 var: container: - use_container: 1 suite: bullseye arch: amd64 deps: diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index b589b53..83d0ed7 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -3,10 +3,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 git_hash: cdb052f1d4056cd510cb83197b55868427b87476 version: '[% c("abbrev") %]' +container: + use_container: 1 var: - container: - use_container: 1 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3792a76..c4935c4 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -3,9 +3,9 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 git_hash: cdb052f1d4056cd510cb83197b55868427b87476 version: '[% c("abbrev") %]' +container: + use_container: 1 var: - container: - use_container: 1 gcc_version: 10.3.0 deps: - automake diff --git a/projects/mmdebstrap-image/config b/projects/mmdebstrap-image/config index e2d0f6a..65c3a0a 100644 --- a/projects/mmdebstrap-image/config +++ b/projects/mmdebstrap-image/config @@ -2,13 +2,12 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %]-[% c("version") %].tar.gz' version: 1 pkg_type: build +container: + use_container: 1 var: ubuntu_version: 22.04 - container: - use_container: 1 - pre: | #!/bin/sh set -e diff --git a/projects/multidict/config b/projects/multidict/config index d242b08..798e817 100644 --- a/projects/multidict/config +++ b/projects/multidict/config @@ -4,8 +4,7 @@ git_url: https://github.com/aio-libs/multidict.git git_hash: bd40998bf220820a7d636d5f02912c8d4abcac23 # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/nasm/config b/projects/nasm/config index ff82004..b846ca6 100644 --- a/projects/nasm/config +++ b/projects/nasm/config @@ -1,9 +1,8 @@ # vim: filetype=yaml sw=2 version: 2.14.02 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/ncdns/config b/projects/ncdns/config index 0785e51..9ee2097 100644 --- a/projects/ncdns/config +++ b/projects/ncdns/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml sw=2 #version: 0.0.9 # Using latest master branch because we need the stream isolation and # disable_namecoin_tlsa features. Once they're in a tagged release, we'll go @@ -9,10 +10,10 @@ git_url: https://github.com/namecoin/ncdns.git # back to using a hash that corresponds to a tag here. git_hash: 'ca0fe5552806a4275f38468c4d3fbcb2cba1cb79' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 go_lib_deps: - gogroupcache - godegoutils diff --git a/projects/ncprop279/config b/projects/ncprop279/config index 5d4ee51..c58c21f 100644 --- a/projects/ncprop279/config +++ b/projects/ncprop279/config @@ -1,3 +1,4 @@ +# vim: filetype=yaml sw=2 #version: '0.0.2' # Using latest master branch because we need the stream isolation feature. # Once it's in a tagged release, we'll go back to using a version number here. @@ -8,10 +9,10 @@ git_url: https://github.com/namecoin/ncprop279.git # to a tag here. git_hash: '7bdd741d70258407f66aab52b24788f1acccc56b' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 go_lib_deps: - godns - goeasyconfig diff --git a/projects/ninja/config b/projects/ninja/config index 8e2c245..045f587 100644 --- a/projects/ninja/config +++ b/projects/ninja/config @@ -3,9 +3,8 @@ version: '[% c("abbrev") %]' git_url: https://github.com/ninja-build/ninja.git git_hash: b25c08bda4949192c69cea4cee057887341a2ffc #v1.9.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/node/config b/projects/node/config index 0dfa76c..6250ac4 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,11 +1,11 @@ # vim: filetype=yaml sw=2 version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: node_version: 12.22.1 node_hash: dd650df7773a6ed3e390320ba51ef33cba6499f0e9397709ea3d1debdcbcb989 - container: - use_container: 1 targets: windows: diff --git a/projects/nsis/config b/projects/nsis/config index f6dd12d..a7d9d13 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 version: 3.06.1 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 deps: - build-essential - libmpc-dev diff --git a/projects/nss/config b/projects/nss/config index da59623..6dc7da8 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -4,9 +4,9 @@ filename: '[% project %]-[% c("version") %]-with-nspr-[% c("nspr_version") %]-[% # commit in libs/build-all.sh version: 3.66 nspr_version: 4.30 +container: + use_container: 1 var: - container: - use_container: 1 deps: - build-essential - gyp diff --git a/projects/obfs4/config b/projects/obfs4/config index a05d2d4..99041b9 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -6,9 +6,8 @@ tag_gpg_id: 1 gpg_keyring: yawning.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 targets: nightly: diff --git a/projects/objx/config b/projects/objx/config index 80b1947..62b82b4 100644 --- a/projects/objx/config +++ b/projects/objx/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/objx git_hash: facf9a85c22f48d2f52f2380e4efce1768749a89 # v0.1.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/stretchr/objx input_files: diff --git a/projects/openssl/config b/projects/openssl/config index 920415f..84438a3 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,11 +1,11 @@ # vim: filetype=yaml sw=2 version: 1.1.1o filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: openssldir: 'usr/local' - container: - use_container: 1 targets: linux-x86_64: diff --git a/projects/osslsigncode/config b/projects/osslsigncode/config index 03dbcba..a31aa2f 100644 --- a/projects/osslsigncode/config +++ b/projects/osslsigncode/config @@ -3,9 +3,9 @@ version: '[% c("abbrev") %]' git_url: https://github.com/mtrojnar/osslsigncode git_hash: e72a1937d1a13e87074e4584f012f13e03fc1d64 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 0 var: - container: - use_container: 0 deps: - autoconf - libtool diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index b92b45e..7043c09 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel git_hash: 74e13972527c0130d4245897fef9c300a091b14b #v1.5.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/datachannel go_lib_deps: - pion-logging diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index f281abe..fa83114 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls git_hash: d2f797183a9f044ce976e6df6f362662ca722412 #v2.1.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/dtls go_lib_deps: - goxcrypto diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 4f2e34b..87097f2 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice git_hash: 9b523704bbc3c73764dfee81c5215e2c23641ba4 #v2.2.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/ice go_lib_deps: - gocheck diff --git a/projects/pion-interceptor/config b/projects/pion-interceptor/config index a45ee5f..191f230 100644 --- a/projects/pion-interceptor/config +++ b/projects/pion-interceptor/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/interceptor git_hash: ec75ceafde7ff8751f8a2a759208a7b349804d97 #v0.1.11 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/interceptor go_lib_deps: - pion-logging diff --git a/projects/pion-logging/config b/projects/pion-logging/config index e3429ba..d8e7d86 100644 --- a/projects/pion-logging/config +++ b/projects/pion-logging/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/logging git_hash: 0387f8acdeb20faf48e539e74906dd633851f3a8 #v0.2.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/logging input_files: diff --git a/projects/pion-mdns/config b/projects/pion-mdns/config index 9bff5af..1982cb2 100644 --- a/projects/pion-mdns/config +++ b/projects/pion-mdns/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/mdns git_hash: 9199cc788e17df3558f7069ffcf099da260f5913 #v0.0.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/mdns go_lib_deps: - goxnet diff --git a/projects/pion-randutil/config b/projects/pion-randutil/config index 28c74f0..8fdcb5e 100644 --- a/projects/pion-randutil/config +++ b/projects/pion-randutil/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/randutil git_hash: 3e7aefb6fd280d89fca72f1596348f1939525187 #v0.1.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/randutil input_files: diff --git a/projects/pion-rtcp/config b/projects/pion-rtcp/config index ec163c9..4f5bde4 100644 --- a/projects/pion-rtcp/config +++ b/projects/pion-rtcp/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtcp git_hash: a4508c4eaed67332f45d8e2d41b9a936b596ca5c #v1.2.9 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/rtcp go_lib_deps: - testify diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 11a380c..65a8da0 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp git_hash: f47320ba42ace6b75f1f579fc4404c26cf2b0dce #v1.7.13 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/rtp go_lib_deps: - pion-randutil diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index 6fb0162..04aad03 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp git_hash: 7e00bf835f80c3e37a83f4127e14440b647ce316 #v1.8.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/sctp go_lib_deps: - go-spew diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 7e5c26b..8efc62a 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp git_hash: 36cd1e811dcddcbd38730f981533ea7c68fab715 #v3.0.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/sdp go_lib_deps: - pion-randutil diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index 1935197..507ff46 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp git_hash: 4555d8ddce7c5fdf808d34d2b1a9be4a6458e417 #v2.0.9 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/srtp go_lib_deps: - pion-logging diff --git a/projects/pion-stun/config b/projects/pion-stun/config index 00c5111..08fd60d 100644 --- a/projects/pion-stun/config +++ b/projects/pion-stun/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/stun git_hash: 4fa7a9d658b6037114fd35b6cb257979ed474a9b # v0.3.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/stun input_files: diff --git a/projects/pion-transport/config b/projects/pion-transport/config index ec65560..3ebfea9 100644 --- a/projects/pion-transport/config +++ b/projects/pion-transport/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/transport git_hash: 538d788545fbf8f8379e09ed7747543561bfe8d9 #v0.13.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/transport go_lib_deps: - goxnet diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 2a8cf18..f28fc65 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn git_hash: ed2e7a9679b43e4040ae932b705d6cbd95536db4 #v2.0.8 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/turn go_lib_deps: - pion-logging diff --git a/projects/pion-udp/config b/projects/pion-udp/config index 0a939d5..e97f88f 100644 --- a/projects/pion-udp/config +++ b/projects/pion-udp/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/udp git_hash: 534f92eb13db661274eb15a8ea186585e9f1e182 #v0.1.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/udp go_lib_deps: - pion-transport diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index 6938249..9fdb8c7 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc git_hash: 7367daf2324b66290f0bdbaab1e51297de1f4989 #v3.1.41 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/pion/webrtc go_lib_deps: - agouti diff --git a/projects/pretty/config b/projects/pretty/config index 7514e53..f7dd88d 100644 --- a/projects/pretty/config +++ b/projects/pretty/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/kr/pretty git_hash: 73f6ac0b30a98e433b289500d779f50c1a6f0712 # v0.1.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/kr/pretty go_lib_deps: - text diff --git a/projects/pty/config b/projects/pty/config index ab2d7bd..18cd86b 100644 --- a/projects/pty/config +++ b/projects/pty/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/kr/pty git_hash: 282ce0e5322c82529687d609ee670fac7c7d917c # v1.1.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/kr/pty input_files: diff --git a/projects/pyaes/config b/projects/pyaes/config index 6fba344..104cf53 100644 --- a/projects/pyaes/config +++ b/projects/pyaes/config @@ -1,9 +1,8 @@ # vim: filetype=yaml sw=2 version: 1.6.1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image - URL: https://files.pythonhosted.org/packages/source/p/pyaes/pyaes-[% c("version") %].tar.gz diff --git a/projects/python/config b/projects/python/config index deacca3..4798ca7 100644 --- a/projects/python/config +++ b/projects/python/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 version: 3.6.8 filename: 'python-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 deps: - xz-utils - build-essential diff --git a/projects/rust/config b/projects/rust/config index 1723e61..88c542f 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,12 +1,12 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("var/current_version") %]' +container: + use_container: 1 var: current_version: 1.53.0 previous_version: 1.52.0 - container: - use_container: 1 targets: android: diff --git a/projects/siphash/config b/projects/siphash/config index 7e40bc7..d48d2e3 100644 --- a/projects/siphash/config +++ b/projects/siphash/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/dchest/siphash.git git_hash: 34f201214d993633bb24f418ba11736ab8b55aa7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/dchest/siphash input_files: diff --git a/projects/six/config b/projects/six/config index e0945d1..4adcedb 100644 --- a/projects/six/config +++ b/projects/six/config @@ -4,8 +4,7 @@ git_url: https://github.com/benjaminp/six.git git_hash: d927b9e27617abca8dbf4d66cc9265ebbde261d6 # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/smux/config b/projects/smux/config index 54d2a11..c615ff8 100644 --- a/projects/smux/config +++ b/projects/smux/config @@ -1,13 +1,14 @@ +# vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/xtaci/smux git_hash: c6969d8a76874342611f4b544d05b1590f1a76b1 # v1.5.12 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/xtaci/smux input_files: diff --git a/projects/snowflake/config b/projects/snowflake/config index 089771b..2a0cf3c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -4,9 +4,8 @@ git_url: https://git.torproject.org/pluggable-transports/snowflake.git git_hash: 01ae5b56e8399d29aa18605dc9add913d84dc553 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config index ddd3996..1bd0059 100644 --- a/projects/sqlcipher/config +++ b/projects/sqlcipher/config @@ -3,9 +3,9 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil # The required versions for application-services can be found at the respective # commit in libs/build-all.sh version: 4.4.0 +container: + use_container: 1 var: - container: - use_container: 1 deps: - build-essential - tcl diff --git a/projects/stemns/config b/projects/stemns/config index efb5793..07e70c7 100644 --- a/projects/stemns/config +++ b/projects/stemns/config @@ -3,9 +3,9 @@ version: '[% c("abbrev") %]' git_url: https://github.com/namecoin/StemNS.git git_hash: '68d437491c0308545e149181768cd98e45c1ac82' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 var: - container: - use_container: 1 stem-version: 1.8.0 input_files: diff --git a/projects/testify/config b/projects/testify/config index 726545f..bee1e8e 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify git_hash: 083ff1c0449867d0d8d456483ee5fab8e0c0e1e6 #v1.7.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/stretchr/testify go_lib_deps: - go-difflib diff --git a/projects/text/config b/projects/text/config index aeb449b..5323b84 100644 --- a/projects/text/config +++ b/projects/text/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/kr/text git_hash: e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f # v0.1.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/kr/text go_lib_deps: - pty diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 3884ef5..0cbe245 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -4,13 +4,13 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: 0f264c8891904b63057c46a4e3902cc73b6b860c git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 +container: + use_container: 1 var: deps: - build-essential - unzip - container: - use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index a8e1bd3..9b77ebf 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,10 +1,10 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +container: + use_container: 1 var: - container: - use_container: 1 ddmg: '[% INCLUDE ddmg.sh %]' deps: - python diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index fb68706..f1dac65 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -5,9 +5,8 @@ git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image @@ -15,9 +14,8 @@ steps: src-tarballs: filename: 'src-[% project %]-[% c("version") %].tar.xz' input_files: [] - var: - container: - use_container: 0 + container: + use_container: 0 targets: nightly: diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 09f1bc7..f9be0fd 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -4,14 +4,14 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: aeb63ebd079b646a3ec1b7b84d755653baa467d7 git_url: https://github.com/thaliproject/Tor_Onion_Proxy_Library.git git_submodule: 1 +container: + use_container: 1 var: deps: - build-essential - unzip - zip - container: - use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 diff --git a/projects/tor/config b/projects/tor/config index 09b7ed3..119ae2e 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -6,10 +6,10 @@ git_url: https://git.torproject.org/tor.git git_submodule: 1 gpg_keyring: tor.gpg tag_gpg_id: 1 +container: + use_container: 1 var: - container: - use_container: 1 deps: - build-essential - automake diff --git a/projects/typing_extensions/config b/projects/typing_extensions/config index 4926d82..b65637b 100644 --- a/projects/typing_extensions/config +++ b/projects/typing_extensions/config @@ -4,8 +4,7 @@ git_url: https://github.com/python/typing.git git_hash: baf63c5924a2b9695175df5d47ced40596024b78 # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config index 0c55e5b..9b9157a 100644 --- a/projects/uniffi-rs/config +++ b/projects/uniffi-rs/config @@ -4,9 +4,8 @@ git_url: https://github.com/mozilla/uniffi-rs git_hash: ea3ff0402438ef1ebceda4c5fbbbd2ed6a9be227 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/uuid/config b/projects/uuid/config index e53c525..b22d715 100644 --- a/projects/uuid/config +++ b/projects/uuid/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/google/uuid git_hash: 44b5fee7c49cf3bcdf723f106b36d56ef13ccc88 #v1.3.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/google/uuid input_files: diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config index 96bf873..762b2fe 100644 --- a/projects/wasi-sysroot/config +++ b/projects/wasi-sysroot/config @@ -5,9 +5,8 @@ git_hash: b36c433738f0c29160a5ac1c1cee1b1b884bf4a0 git_url: https://github.com/CraneStation/wasi-sdk git_submodule: 1 -var: - container: - use_container: 1 +container: + use_container: 1 targets: linux: diff --git a/projects/yarl/config b/projects/yarl/config index 506bec1..0475bac 100644 --- a/projects/yarl/config +++ b/projects/yarl/config @@ -4,8 +4,7 @@ git_url: https://github.com/aio-libs/yarl.git git_hash: 619cc2203b8888fb9ad552c4a3da6f8b31d1fbac # TODO: This Git repo doesn't use GPG sigs. We should pester them about that. filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/projects/zlib/config b/projects/zlib/config index 957ef6d..7e27554 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -5,11 +5,11 @@ git_hash: 'v[% c("version") %]' git_url: https://github.com/madler/zlib.git gpg_keyring: zlib.gpg tag_gpg_id: 1 +container: + use_container: 1 var: flag_mwindows: '' - container: - use_container: 1 input_files: - project: container-image diff --git a/projects/zstd/config b/projects/zstd/config index d850489..694e77f 100644 --- a/projects/zstd/config +++ b/projects/zstd/config @@ -4,9 +4,8 @@ git_url: https://github.com/facebook/zstd.git git_hash: 97a3da1df009d4dc67251de0c4b1c9d7fe286fc1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 +container: + use_container: 1 input_files: - project: container-image diff --git a/rbm b/rbm index 98be5a6..e93302b 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 98be5a6247850ecbdf9641a96b176a071dab2f5b +Subproject commit e93302bd80b80dd498a91cd018bcb4c81638b546 diff --git a/rbm.conf b/rbm.conf index 365bbf7..6bf32a6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,6 +6,11 @@ build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %] pkg_type: build +container: + disable_network: + # disable network in the build scripts + build: 1 + steps: src-tarballs: compress_tar: xz @@ -80,7 +85,7 @@ var: build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] - [% IF c("var/container/use_container") && ! c("var/container/global_disable") -%] + [% IF c("container/use_container") && ! c("container/global_disable") -%] [% c("var/container/suite") %] [% c("var/container/arch") %] [% END -%] @@ -88,12 +93,6 @@ var: build: [% SET step = c("step") -%] [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %] - container: - dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' - user: rbm - disable_network: - # disable network in the build scripts - build: 1 locale_ja: ja locales: @@ -179,7 +178,7 @@ var: export SHELL=/bin/bash export HOME=$rootdir umask 0022 - [% IF c("var/container/global_disable") -%] + [% IF c("container/global_disable") -%] rm -Rf /var/tmp/build /var/tmp/dist [% END -%] @@ -281,6 +280,10 @@ targets: abi: arm64-v8a cross_prefix: aarch64-linux-android android: + container: + disable_network: + # Disable network in the script for merging GeckoView .aar files + merge_aars: 1 var: android: 1 compiler: android-toolchain @@ -295,9 +298,6 @@ targets: container: suite: bullseye arch: amd64 - disable_network: - # Disable network in the script for merging GeckoView .aar files - merge_aars: 1 deps: - build-essential - python3 @@ -480,84 +480,13 @@ targets: build_id: 1 no_containers: - var: - container: - global_disable: 1 + container: + global_disable: 1 # allow git tag signed using an expired key. # https://bugs.torproject.org/19737 gpg_allow_expired_keys: 1 -remote_start: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_start") %][% END %]' -remote_exec: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_exec") %][% END %]' -remote_put: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_put") %][% END %]' -remote_get: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_get") %][% END %]' -remote_finish: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_finish") %][% END %]' - -container: - remote_start: | - #!/bin/sh - set -e - if [ $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'* | wc -l) -ne 1 ] - then - echo "Can't find container image in input files" >&2 - ls -l '[% c("remote_srcdir") %]' >&2 - exit 1 - fi - [% c("rbmdir") %]/container extract '[% c("var/container/dir") %]' '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'* - test -d '[% c("var/container/dir") %]'/home/rbm || \ - [% c("rbmdir") %]/container run --chroot='[% c("var/container/dir") %]' -- /usr/sbin/useradd -m [% c("var/container/user") %] - - remote_exec: | - #!/bin/sh - set -e - [% IF c("interactive") -%] - echo Container directory: [% shell_quote(c("var/container/dir")) %] - [% END -%] - mkdir -p '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rbm - echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rbm/cmd - echo [% shell_quote(c('exec_cmd')) %] >> '[% c("var/container/dir") %]'/rbm/cmd - echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rbm/run - [% IF c("var/container/disable_network/" _ c("exec_name")) -%] - # Some programs such as gradle need the lo interface to be up. - # See for example tor-browser#31293 - echo 'ip link set lo up' >> '[% c("var/container/dir") %]'/rbm/run - [% END -%] - [% IF c('exec_as_root'); SET user = 'root'; ELSE; SET user = c("var/container/user", { error_if_undef => 1 }); END; %] - echo 'su - [% user %] -c /rbm/cmd' >> '[% c("var/container/dir") %]'/rbm/run - chmod +x '[% c("var/container/dir") %]'/rbm/cmd - chmod +x '[% c("var/container/dir") %]'/rbm/run - [% - IF c("var/container/disable_network/" _ c("exec_name")); - SET disable_network = '--disable-network'; - ELSE; - SET disable_network = ''; - END; - -%] - [% c("rbmdir") %]/container run [% disable_network %] --chroot='[% c("var/container/dir") %]' -- /rbm/run - - remote_put: | - #!/bin/sh - set -e - [% - SET src = shell_quote(c('put_src', { error_if_undef => 1 })); - SET dst = shell_quote(c('put_dst', { error_if_undef => 1 })); - -%] - [% c("rbmdir") %]/container put '[% c("var/container/dir") %]' [% src %] [% dst %] [% c("var/container/user") %] - - remote_get: | - #!/bin/sh - set -e - [% - SET src = shell_quote(c('get_src', { error_if_undef => 1 })); - SET dst = shell_quote(c('get_dst', { error_if_undef => 1 })); - -%] - [% c("rbmdir") %]/container get '[% c("var/container/dir") %]' [% src %] [% dst %] - - remote_finish: | - #!/bin/sh - set -e - [% c("rbmdir") %]/container remove '[% c("var/container/dir") %]' --- | # This part of the file contains options written in perl use IO::CaptureOutput qw(capture_exec); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40513: Add script for signing Android apks
by gitolite role 12 Jul '22

12 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 54ec362 Bug 40513: Add script for signing Android apks 54ec362 is described below commit 54ec362079ca5acd0eb1a5e92972ee4e1c095db8 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Tue May 31 15:08:02 2022 -0600 Bug 40513: Add script for signing Android apks --- tools/signing/android-signing | 141 ++++++++++++++++++++++++++++++++++++++++++ tools/signing/pkcs11_java.cfg | 4 ++ 2 files changed, 145 insertions(+) diff --git a/tools/signing/android-signing b/tools/signing/android-signing new file mode 100755 index 0000000..7c2ee50 --- /dev/null +++ b/tools/signing/android-signing @@ -0,0 +1,141 @@ +#!/bin/bash + +# Sign apk for each target architecture. +# This script requires two command line arguments. +# Usage: android-signing <version> <path/to/signing/key> + +# In addition, hard-coding the path to an Android SDK build-tools version, as +# BUILD_TOOLS, is required. + +set -x +set -e + +VERSION=$1 +SIGNING_KEY_PATH=$2 + +# TODO set correctly. +BUILD_TOOLS=/path/to/build-tools/version +export PATH="${BUILD_TOOLS}:${PATH}" + +ARCHS="armv7 aarch64 x86 x86_64" + +# Sign individual apk +sign_apk() { + INPUTAPK="$1" + + # https://developer.android.com/studio/publish/app-signing#sign-manually + # After running `gradlew assembleRelease`, creates an unsigned-unaligned apk + + # Aligning ensures that all uncompressed data starts with a particular byte + # alignment relative to the start of the file, which may reduce the amount + # of RAM consumed by an app. + # zipalign -v -p 4 my-app-unsigned.apk my-app-unsigned-aligned.apk + echo Aligning and signing ${INPUTAPK} + + # Append the different stages of signing + UNSIGNED_UNALIGNED_APK=`echo "${INPUTAPK}" | sed 's/\.apk/-unsigned-unaligned.apk/'` + UNSIGNED_APK=`echo "${UNSIGNED_UNALIGNED_APK}" | sed 's/-unaligned//'` + SIGNED_APK=`echo "${UNSIGNED_APK}" | sed 's/-unsigned//'` + + cp "${INPUTAPK}" "${UNSIGNED_UNALIGNED_APK}" + + # Step 1: Align + zipalign -v -p 4 "${UNSIGNED_UNALIGNED_APK}" "${UNSIGNED_APK}" + if [ ! $? = 0 ]; then + echo "zipalign failed" + exit 1 + fi + echo zipalign succeeded + + # Step 2: Verify alignment + zipalign -vc 4 "${UNSIGNED_APK}" + if [ ! $? = 0 ]; then + echo "zipalign verify failed" + exit 1 + fi + echo zipalign verify succeeded + + # Step 3: Sign + # Use this command if reading key from file + apksigner sign --verbose -ks ${SIGNING_KEY_PATH} --ks-type pkcs12 --ks-pass env:KSPASS --debuggable-apk-permitted=false --out "${SIGNED_APK}" "${UNSIGNED_APK}" + + # Or, use below command if using a hardware token + # apksigner sign --verbose --provider-class sun.security.pkcs11.SunPKCS11 --provider-arg pkcs11_java.cfg --ks NONE --ks-type PKCS11 --debuggable-apk-permitted=false --out "${SIGNED_APK}" "${UNSIGNED_APK}" + + if [ ! $? = 0 ]; then + echo "apksigner sign failed" + exit 1 + fi + echo apksigner sign succeeded + + # Step 4: Verify signature + apksigner verify --verbose "${SIGNED_APK}" + if [ ! $? = 0 ]; then + echo "apksigner verify failed" + exit 1 + fi + + echo apksigner verify succeeded +} + +# Rename and verify signing certificate +finalize() { + for arch in ${ARCHS}; do + mv tor-browser-${VERSION}-android-${arch}-multi{-qa,}.apk + done + + for arch in ${ARCHS}; do + verified=`apksigner verify --print-certs --verbose tor-browser-${VERSION}-android-${arch}-multi.apk` + scheme_v1= + scheme_v2= + cert_digest= + pubkey_digest= + + # Verify the expected signing key was used, Alpha verses Release based on the filename. + if `echo ${VERSION} | grep -q a`; then + scheme_v1="Verified using v1 scheme (JAR signing): true" + scheme_v2="Verified using v2 scheme (APK Signature Scheme v2): true" + cert_digest="Signer #1 certificate SHA-256 digest: 15f760b41acbe4783e667102c9f67119be2af62fab07763f9d57f01e5e1074e1" + pubkey_digest="Signer #1 public key SHA-256 digest: 4e617e6516f81123ca58e718d617a704ac8365c575bd9e7a731ba5dd0476869d" + else + scheme_v1="Verified using v1 scheme (JAR signing): true" + scheme_v2="Verified using v2 scheme (APK Signature Scheme v2): true" + cert_digest="Signer #1 certificate SHA-256 digest: 20061f045e737c67375c17794cfedb436a03cec6bacb7cb9f96642205ca2cec8" + pubkey_digest="Signer #1 public key SHA-256 digest: 343ca8a2e5452670bdc335a181a4baed909f868937d68c4653e44ef84de8dfc6" + fi + for digest in "${scheme_v1}" "${scheme_v2}" "${cert_digest}" "${pubkey_digest}"; do + if ! `echo "${verified}" | grep -q "${digest}"`; then + echo "Expected digest not found:" + echo ${digest} + echo "in:" + echo ${verified} + exit 1 + fi + done + done + + echo Done. +} + +if [ -z "$VERSION" ]; then + echo Provide version number + exit +fi + +if [ -z "${SIGNING_KEY_PATH}" ]; then + echo Provide the path to the signing key: release or alpha + exit +fi + +if [ -z "$KSPASS" ]; then + echo "Enter keystore passphrase" + stty -echo; read KSPASS; stty echo + export KSPASS +fi + +# Sign all packages +for arch in ${ARCHS}; do + sign_apk tor-browser-${VERSION}-android-${arch}-multi-qa.apk +done + +finalize diff --git a/tools/signing/pkcs11_java.cfg b/tools/signing/pkcs11_java.cfg new file mode 100644 index 0000000..2766a78 --- /dev/null +++ b/tools/signing/pkcs11_java.cfg @@ -0,0 +1,4 @@ +name = OpenSC-PKCS11 +description = SunPKCS11 via OpenSC +library = /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so +slotListIndex = 0 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40513: Add script for signing Android apks
by gitolite role 12 Jul '22

12 Jul '22

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits July 2022