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
2 changed files:
Changes:
| ... | ... | @@ -21,10 +21,10 @@ var: |
| 21 | 21 | browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
|
| 22 | 22 | browser_build: 1
|
| 23 | 23 | branding_directory_prefix: 'tb'
|
| 24 | - copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
|
|
| 24 | + copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
|
|
| 25 | 25 | nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
|
| 26 | 26 | gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
|
| 27 | - git_commit: '[% exec("git rev-parse HEAD") %]'
|
|
| 27 | + git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]'
|
|
| 28 | 28 | deps:
|
| 29 | 29 | - build-essential
|
| 30 | 30 | - autoconf
|
| ... | ... | @@ -53,7 +53,7 @@ var: |
| 53 | 53 | mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %]
|
| 54 | 54 | rm -Rf "$rezip_tmpdir"
|
| 55 | 55 | |
| 56 | - l10n-changesets: '[% exec("cat browser/locales/l10n-changesets.json") %]'
|
|
| 56 | + l10n-changesets: '[% exec("git --no-pager show " _ c("git_hash") _ ":browser/locales/l10n-changesets.json", { exec_noco => 1 }) %]'
|
|
| 57 | 57 | |
| 58 | 58 | steps:
|
| 59 | 59 | src-tarballs:
|
| ... | ... | @@ -22,9 +22,9 @@ var: |
| 22 | 22 | browser_rebase: 1
|
| 23 | 23 | browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
|
| 24 | 24 | browser_build: 1
|
| 25 | - copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
|
|
| 25 | + copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
|
|
| 26 | 26 | gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
|
| 27 | - git_commit: '[% exec("git rev-parse HEAD") %]'
|
|
| 27 | + git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]'
|
|
| 28 | 28 | deps:
|
| 29 | 29 | - build-essential
|
| 30 | 30 | - autoconf
|
| ... | ... | @@ -41,7 +41,7 @@ var: |
| 41 | 41 | glean_parser: 14.0.1
|
| 42 | 42 | variant: beta
|
| 43 | 43 | has_l10n: '[% !c("var/testbuild") && !c("var/locales").empty %]'
|
| 44 | - l10n-changesets: '[% exec("cat browser/locales/l10n-changesets.json") %]'
|
|
| 44 | + l10n-changesets: '[% exec("git --no-pager show " _ c("git_hash") _ ":browser/locales/l10n-changesets.json", { exec_noco => 1 }) %]'
|
|
| 45 | 45 | |
| 46 | 46 | targets:
|
| 47 | 47 | release:
|