Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to identify dSYMs by UUID not channel (#28268)

Browse source 
This should make it possible to more reliably symbolicate crash reports
from nightly, and from users with pending auto-updates.


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben.kunkle@gmail.com>
This commit is contained in:
Conrad Irwin 2025-04-07 16:08:38 -06:00 • committed by GitHub
parent 862d0c07ca
commit f03efeda73
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
script/bundle-mac
View file

@ -191,11 +191,13 @@ function prepare_binaries() {
local app_path=$2 local app_path=$2
echo "Unpacking dSYMs for $architecture" echo "Unpacking dSYMs for $architecture"
if ! dsymutil --flat target/${architecture}/${target_dir}/Zed 2> target/dsymutil.log; then exe_path="target/${architecture}/${target_dir}/Zed"
if ! dsymutil --flat "${exe_path}" 2> target/dsymutil.log; then
echo "dsymutil failed" echo "dsymutil failed"
cat target/dsymutil.log cat target/dsymutil.log
exit 1 exit 1
fi fi
uuid=$(dwarfdump --uuid "${exe_path}" | cut -d ' ' -f 2 | tr 'A-F' 'a-f')
version="$(cargo metadata --no-deps --manifest-path crates/zed/Cargo.toml --offline --format-version=1 | jq -r '.packages | map(select(.name == "zed"))[0].version')" version="$(cargo metadata --no-deps --manifest-path crates/zed/Cargo.toml --offline --format-version=1 | jq -r '.packages | map(select(.name == "zed"))[0].version')"
if [ "$channel" == "nightly" ]; then if [ "$channel" == "nightly" ]; then
version="$version-$(git rev-parse --short HEAD)" version="$version-$(git rev-parse --short HEAD)"
@ -207,11 +209,11 @@ function prepare_binaries() {
echo "Gzipping dSYMs for $architecture" echo "Gzipping dSYMs for $architecture"
gzip -f target/${architecture}/${target_dir}/Zed.dwarf gzip -f target/${architecture}/${target_dir}/Zed.dwarf
echo "Uploading dSYMs for $architecture" echo "Uploading dSYMs${architecture} for $architecture to by_uuid/${uuid}.dwarf.gz"
upload_to_blob_store_public \ upload_to_blob_store_public \
"zed-debug-symbols" \ "zed-debug-symbols" \
target/${architecture}/${target_dir}/Zed.dwarf.gz \ target/${architecture}/${target_dir}/Zed.dwarf.gz \
"$channel/Zed-$version-${architecture}.dwarf.gz" "by-uuid/${uuid}.dwarf.gz"
cp target/${architecture}/${target_dir}/zed "${app_path}/Contents/MacOS/zed" cp target/${architecture}/${target_dir}/zed "${app_path}/Contents/MacOS/zed"
cp target/${architecture}/${target_dir}/cli "${app_path}/Contents/MacOS/cli" cp target/${architecture}/${target_dir}/cli "${app_path}/Contents/MacOS/cli"

4
script/lib/blob-store.sh
View file

@ -24,10 +24,10 @@ function upload_to_blob_store_with_acl
function upload_to_blob_store_public function upload_to_blob_store_public
{ {
upload_to_blob_store_with_acl $1 $2 $3 "x-amz-acl:public-read" upload_to_blob_store_with_acl "$1" "$2" "$3" "x-amz-acl:public-read"
} }
function upload_to_blob_store function upload_to_blob_store
{ {
upload_to_blob_store_with_acl $1 $2 $3 "x-amz-acl:private" upload_to_blob_store_with_acl "$1" "$2" "$3" "x-amz-acl:private"
} }

12
script/symbolicate
View file

@ -53,10 +53,18 @@ else # ips file
mkdir -p target/dsyms/$channel mkdir -p target/dsyms/$channel
dsym="$channel/Zed-$version-$arch.dwarf" # NOTE: if you see "no such file --uuid", you need to update your symbolicate
uuid=$(symbolicate $input_file --uuid || true)
if [[ $? -ne 0 ]]; then
echo "You need to update your symbolicate: cargo install symbolicate"
exit 1
fi
dsym="$uuid.dwarf"
if [[ ! -f target/dsyms/$dsym ]]; then if [[ ! -f target/dsyms/$dsym ]]; then
echo "Downloading $dsym..." echo "Downloading $dsym..."
curl -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/$channel/Zed-$version-$arch.dwarf.gz" curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/by_uuid/${uuid}.dwarf.gz" ||
curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/$channel/Zed-$version-$arch.dwarf.gz"
gunzip target/dsyms/$dsym.gz gunzip target/dsyms/$dsym.gz
fi fi