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

Bug 1874207 - Include provisioprofile ignore on dep update verify r=releng-reviewers,bhearsum

Browse source 
Adds Contents/embedded.provisionprofile to ignored paths when verifying dep updates since it's not included on dep builds

Differential Revision: https://phabricator.services.mozilla.com/D198458
This commit is contained in:
Heitor Neiva 2024-01-12 22:13:39 +00:00
parent 2ddf15f797
commit 2a3d7392c1
2 changed files with 10 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
tools/update-verify/release/common/check_updates.sh
View file

@ -22,20 +22,20 @@ check_updates () {
echo "FAILED: cannot unpack_build $update_platform source $source_package" echo "FAILED: cannot unpack_build $update_platform source $source_package"
return 1 return 1
fi fi
unpack_build $update_platform target "$target_package" $locale unpack_build $update_platform target "$target_package" $locale
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo "FAILED: cannot unpack_build $update_platform target $target_package" echo "FAILED: cannot unpack_build $update_platform target $target_package"
return 1 return 1
fi fi
case $update_platform in case $update_platform in
Darwin_ppc-gcc | Darwin_Universal-gcc3 | Darwin_x86_64-gcc3 | Darwin_x86-gcc3-u-ppc-i386 | Darwin_x86-gcc3-u-i386-x86_64 | Darwin_x86_64-gcc3-u-i386-x86_64 | Darwin_aarch64-gcc3) Darwin_ppc-gcc | Darwin_Universal-gcc3 | Darwin_x86_64-gcc3 | Darwin_x86-gcc3-u-ppc-i386 | Darwin_x86-gcc3-u-i386-x86_64 | Darwin_x86_64-gcc3-u-i386-x86_64 | Darwin_aarch64-gcc3)
platform_dirname="*.app" platform_dirname="*.app"
;; ;;
WINNT*) WINNT*)
platform_dirname="bin" platform_dirname="bin"
;; ;;
Linux_x86-gcc | Linux_x86-gcc3 | Linux_x86_64-gcc3) Linux_x86-gcc | Linux_x86-gcc3 | Linux_x86_64-gcc3)
platform_dirname=`echo $product | tr '[A-Z]' '[a-z]'` platform_dirname=`echo $product | tr '[A-Z]' '[a-z]'`
;; ;;
esac esac
@ -103,8 +103,9 @@ check_updates () {
# If we are testing an OSX mar to update from a production-signed/notarized # If we are testing an OSX mar to update from a production-signed/notarized
# build to a dep-signed one, ignore Contents/CodeResources which won't be # build to a dep-signed one, ignore Contents/CodeResources which won't be
# present in the target, to avoid spurious failures # present in the target, to avoid spurious failures
# Same applies to provisioning profiles, since we don't have them outside of prod
if ${update_to_dep}; then if ${update_to_dep}; then
ignore_coderesources=--ignore-missing=Contents/CodeResources ignore_coderesources="--ignore-missing=Contents/CodeResources --ignore-missing=Contents/embedded.provisionprofile"
else else
ignore_coderesources= ignore_coderesources=
fi fi

3
tools/update-verify/release/compare-directories.py
View file

@ -126,6 +126,9 @@ def compare_listings(
difference_found = False difference_found = False
ignore_missing = ignore_missing or () ignore_missing = ignore_missing or ()
if ignore_missing:
logging.warning("ignoring paths: {}".format(ignore_missing))
left_diff = obj1 - obj2 left_diff = obj1 - obj2
if left_diff: if left_diff:
if left_diff - set(ignore_missing): if left_diff - set(ignore_missing):