Bug 1591538 - Remove removal of Cargo.toml files in the SM tarball; r=sfink
authorAnthony Ramine <nox@nox.paris>
Mon, 18 Nov 2019 08:46:48 +0000
changeset 502381 08a1847989107cb554a0721cf3697768ac21f736
parent 502380 48984ec2df7a94c3403e1a18f18fe2e675376509
child 502382 752245d75539a0a94f5d619782beb340ffe1f2d9
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs1591538
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1591538 - Remove removal of Cargo.toml files in the SM tarball; r=sfink ${tgtpath} always contain "js" by default, so this command is doing absolutely nothing for most people out there, and if it was working it would be deleting every Cargo.toml file from /third_party/rust anyway. Differential Revision: https://phabricator.services.mozilla.com/D50736
js/src/make-source-package.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -244,20 +244,16 @@ README_EOF
         cp -pPR ${STAGING}/patches ${tgtpath}/
     elif [ -d ${TOPSRCDIR}/patches ]; then
         cp -pPR ${TOPSRCDIR}/patches ${tgtpath}/
     fi
 
     # Remove *.pyc and *.pyo files if any
     find ${tgtpath} -type f -name "*.pyc" -o -name "*.pyo" | xargs rm -f
 
-    # Remove non-JS Cargo.toml files (for example, the invalid Cargo.toml files
-    # used for some testing).
-    find ${tgtpath} -type f -name Cargo.toml | grep -v js | xargs rm -f
-
     # Roll the tarball
     echo "Packaging source tarball at ${pkgpath}..."
     ${TAR} $taropts ${pkgpath} -C ${STAGING} ${version}
     ;;
 *)
     echo "Unrecognized command: $cmd"
     ;;
 esac