nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1929571: change PSL branch from master to main, r=jcristau a=NPOTB DONTBUILD

Browse source
This commit is contained in:
Simon Friedberger 2024-11-06 22:01:37 +00:00
parent 70d2732b2a
commit d4164793c6
1 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
View file

@ -68,8 +68,8 @@ REMOTE_SETTINGS_DIR="/services/settings/dumps"
REMOTE_SETTINGS_UPDATED=false REMOTE_SETTINGS_UPDATED=false
DO_SUFFIX_LIST=false DO_SUFFIX_LIST=false
GITHUB_SUFFIX_URL="https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat" PUBLIC_SUFFIX_URL="https://publicsuffix.org/list/public_suffix_list.dat"
GITHUB_SUFFIX_LOCAL="public_suffix_list.dat" PUBLIC_SUFFIX_LOCAL="public_suffix_list.dat"
HG_SUFFIX_LOCAL="effective_tld_names.dat" HG_SUFFIX_LOCAL="effective_tld_names.dat"
HG_SUFFIX_PATH="/netwerk/dns/${HG_SUFFIX_LOCAL}" HG_SUFFIX_PATH="/netwerk/dns/${HG_SUFFIX_LOCAL}"
SUFFIX_LIST_UPDATED=false SUFFIX_LIST_UPDATED=false
@ -274,16 +274,16 @@ function compare_suffix_lists {
HG_SUFFIX_URL="${HGREPO}/raw-file/default/${HG_SUFFIX_PATH}" HG_SUFFIX_URL="${HGREPO}/raw-file/default/${HG_SUFFIX_PATH}"
cd "${BASEDIR}" cd "${BASEDIR}"
echo "INFO: ${WGET} -O ${GITHUB_SUFFIX_LOCAL} ${GITHUB_SUFFIX_URL}" echo "INFO: ${WGET} -O ${PUBLIC_SUFFIX_LOCAL} ${PUBLIC_SUFFIX_URL}"
rm -f "${GITHUB_SUFFIX_LOCAL}" rm -f "${PUBLIC_SUFFIX_LOCAL}"
${WGET} -O "${GITHUB_SUFFIX_LOCAL}" "${GITHUB_SUFFIX_URL}" ${WGET} -O "${PUBLIC_SUFFIX_LOCAL}" "${PUBLIC_SUFFIX_URL}"
echo "INFO: ${WGET} -O ${HG_SUFFIX_LOCAL} ${HG_SUFFIX_URL}" echo "INFO: ${WGET} -O ${HG_SUFFIX_LOCAL} ${HG_SUFFIX_URL}"
rm -f "${HG_SUFFIX_LOCAL}" rm -f "${HG_SUFFIX_LOCAL}"
${WGET} -O "${HG_SUFFIX_LOCAL}" "${HG_SUFFIX_URL}" ${WGET} -O "${HG_SUFFIX_LOCAL}" "${HG_SUFFIX_URL}"
echo "INFO: diffing in-tree suffix list against the suffix list from AMO..." echo "INFO: diffing in-tree suffix list against the suffix list from publicsuffix.org"
${DIFF} ${GITHUB_SUFFIX_LOCAL} ${HG_SUFFIX_LOCAL} | tee "${SUFFIX_LIST_DIFF_ARTIFACT}" ${DIFF} ${PUBLIC_SUFFIX_LOCAL} ${HG_SUFFIX_LOCAL} | tee "${SUFFIX_LIST_DIFF_ARTIFACT}"
if [ -s "${SUFFIX_LIST_DIFF_ARTIFACT}" ] if [ -s "${SUFFIX_LIST_DIFF_ARTIFACT}" ]
then then
return 0 return 0
@ -441,7 +441,7 @@ function stage_remote_settings_files {
function stage_tld_suffix_files { function stage_tld_suffix_files {
cd "${BASEDIR}" cd "${BASEDIR}"
cp -a "${GITHUB_SUFFIX_LOCAL}" "${REPODIR}/${HG_SUFFIX_PATH}" cp -a "${PUBLIC_SUFFIX_LOCAL}" "${REPODIR}/${HG_SUFFIX_PATH}"
} }
function stage_mobile_experiments_files { function stage_mobile_experiments_files {