[builders/tor-browser-build] branch master updated (0a89e14 -> 956803c)
This is an automated email from the git hooks/post-receive script. gk pushed a change to branch master in repository builders/tor-browser-build. from 0a89e14 fixup! Bug 40506: Prepare alpha release 11.5a13 (Desktop+Android) new 88291b7 Bug 40542: Remove var/input_files_list from rbm.conf new 956803c Bug 40542: Move var/rezip from rbm.conf to projects/firefox/config The 2 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: projects/firefox/config | 13 +++++++++++++ rbm.conf | 17 ----------------- 2 files changed, 13 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/tor-browser-build. commit 88291b77d655dc06ef80039721c7de812414a639 Author: Nicolas Vigier <boklm@torproject.org> AuthorDate: Wed Jun 29 15:32:00 2022 +0200 Bug 40542: Remove var/input_files_list from rbm.conf This was added in the first rbm.conf commit, but was never used. --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 3e72042..737b9f6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -96,10 +96,6 @@ var: disable_network: # disable network in the build scripts build: 1 - input_files_list: | - [% FOREACH file IN c("input_files_by_name").keys.sort -%] - [% c("input_files_by_name/" _ file) %] - [% END -%] faketime: "faketime -f \"[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]\"" touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/tor-browser-build. commit 956803cf607491d0b08444aece296238385e8bb5 Author: Nicolas Vigier <boklm@torproject.org> AuthorDate: Wed Jun 29 15:36:24 2022 +0200 Bug 40542: Move var/rezip from rbm.conf to projects/firefox/config var/rezip is only used in projects/firefox, so there is no need to have it in rbm.conf. --- projects/firefox/config | 13 +++++++++++++ rbm.conf | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 15e703a..3b38c83 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -23,6 +23,19 @@ var: container: use_container: 1 + rezip: | + rezip_tmpdir=$(mktemp -d) + mkdir -p "$rezip_tmpdir/z" + unzip -d "$rezip_tmpdir/z" -- [% c("rezip_file") %] || [ $? -lt 3 ] + pushd "$rezip_tmpdir/z" + [% c("zip", { + zip_src => [ '.' ], + zip_args => '$rezip_tmpdir/new.zip', + }) %] + popd + mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %] + rm -Rf "$rezip_tmpdir" + steps: src-tarballs: filename: 'src-[% project %]-[% c("version") %].tar.xz' diff --git a/rbm.conf b/rbm.conf index 737b9f6..0cba45b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -175,19 +175,6 @@ var: sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' - rezip: | - rezip_tmpdir=$(mktemp -d) - mkdir -p "$rezip_tmpdir/z" - unzip -d "$rezip_tmpdir/z" -- [% c("rezip_file") %] || [ $? -lt 3 ] - pushd "$rezip_tmpdir/z" - [% c("zip", { - zip_src => [ '.' ], - zip_args => '$rezip_tmpdir/new.zip', - }) %] - popd - mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %] - rm -Rf "$rezip_tmpdir" - set_default_env: | set -e [% FOREACH env = c('ENV') -%] -- To stop receiving notification emails like this one, please contact the administrator of this repository.
participants (1)
-
gitolite role