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') -%]