[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41288: Use exec_noco option when using exec

[boklm (@boklm)]

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
aefae00e by Nicolas Vigier at 2024-10-30T17:10:36+01:00
Bug 41288: Use exec_noco option when using exec

Use the `exec_noco` option added in rbm#40006.

- - - - -


2 changed files:

- projects/firefox/config
- projects/geckoview/config


Changes:

=====================================
projects/firefox/config
=====================================
@@ -21,10 +21,10 @@ var:
   browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
   browser_build: 1
   branding_directory_prefix: 'tb'
-  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
+  copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
   nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
   gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
-  git_commit: '[% exec("git rev-parse HEAD") %]'
+  git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]'
   deps:
     - build-essential
     - autoconf
@@ -53,7 +53,7 @@ var:
     mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %]
     rm -Rf "$rezip_tmpdir"
 
-  l10n-changesets: '[% exec("cat browser/locales/l10n-changesets.json") %]'
+  l10n-changesets: '[% exec("git --no-pager show " _ c("git_hash") _ ":browser/locales/l10n-changesets.json", { exec_noco => 1 }) %]'
 
 steps:
   src-tarballs:


=====================================
projects/geckoview/config
=====================================
@@ -22,9 +22,9 @@ var:
   browser_rebase: 1
   browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
   browser_build: 1
-  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
+  copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
   gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
-  git_commit: '[% exec("git rev-parse HEAD") %]'
+  git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]'
   deps:
     - build-essential
     - autoconf
@@ -41,7 +41,7 @@ var:
   glean_parser: 14.0.1
   variant: beta
   has_l10n: '[% !c("var/testbuild") && !c("var/locales").empty %]'
-  l10n-changesets: '[% exec("cat browser/locales/l10n-changesets.json") %]'
+  l10n-changesets: '[% exec("git --no-pager show " _ c("git_hash") _ ":browser/locales/l10n-changesets.json", { exec_noco => 1 }) %]'
 
 targets:
   release:



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/aefae00e1ed495efea8e848fc852a07968248aca

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/aefae00e1ed495efea8e848fc852a07968248aca
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20241030/2e56ed69/attachment-0001.htm>