diff options
| author | Marc Mutz <[email protected]> | 2025-01-28 08:17:56 +0100 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2025-02-01 01:09:31 +0100 |
| commit | cbea57f80b43a969d2e15d53b759abb9924d52c1 (patch) | |
| tree | 09436efaef20366b2849e42e38ed4517720d6f84 /util | |
| parent | 2230f515907ed1bb29156766bc3fea2984fc67ae (diff) | |
util/update_public_suffix_list.sh: use commit date, not wall clock
This is both more accurate and also more stable: The suffix-list
update usually takes several days to go through all branches; using
the commit date avoids using newer fetch dates in older branches.
Pick-to: 6.9 6.8 6.5 6.2 5.15
Change-Id: Ifefd7158e4104c7bbdfe6a2d8a505d8acf7275b4
Reviewed-by: Edward Welbourne <[email protected]>
Reviewed-by: Mårten Nordheim <[email protected]>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/update_public_suffix_list.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/update_public_suffix_list.sh b/util/update_public_suffix_list.sh index 80d5f2d175b..e261df74e9e 100755 --- a/util/update_public_suffix_list.sh +++ b/util/update_public_suffix_list.sh @@ -54,14 +54,14 @@ check_or_die output -w "$PSL_DATA_CPP" check_or_die binary-output -w "$PUBLIC_SUFFIX_LIST_DAFSA" GITSHA1=$(cd "$PUBLIC_SUFFIX_LIST_DAT_DIR" && git log -1 --format=format:%H) -TODAY=$(date +%Y-%m-%d) -msg "Using $INPUT @ $GITSHA1, fetched on $TODAY" +GITDATE=$(cd "$PUBLIC_SUFFIX_LIST_DAT_DIR" && git log -1 --format=format:%cs) +msg "Using $INPUT @ $GITSHA1, fetched on $GITDATE" run_or_die "$MAKE_DAFSA" "$INPUT" "$PSL_DATA_CPP" run_or_die "$MAKE_DAFSA" --output-format=binary "$INPUT" "$PUBLIC_SUFFIX_LIST_DAFSA" # update the first Version line in qt_attribution.json with the new SHA1 and date: -run_or_die sed -i -e "1,/\"Version\":/{ /\"Version\":/ { s/[0-9a-fA-F]\{40\}/$GITSHA1/; s/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}/$TODAY/ } }" "$ATTRIBUTION_JSON" +run_or_die sed -i -e "1,/\"Version\":/{ /\"Version\":/ { s/[0-9a-fA-F]\{40\}/$GITSHA1/; s/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}/$GITDATE/ } }" "$ATTRIBUTION_JSON" # update the first "PURL" line with the new SHA1: run_or_die sed -i -e "1,/\"PURL\":/{ /\"PURL\":/ { s/[0-9a-fA-F]\{40\}/$GITSHA1/; } }" "$ATTRIBUTION_JSON" @@ -73,7 +73,7 @@ run_or_die git add "$ATTRIBUTION_JSON" run_or_die git commit -m "Update public suffix list Version $GITSHA1, fetched on -$TODAY. +$GITDATE. [ChangeLog][Third-Party Code] Updated the public suffix list to upstream SHA $GITSHA1. |