Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify ARM triples, add script to upload ARM tarballs correctly #355

Closed
wants to merge 3 commits into from
Closed

Simplify ARM triples, add script to upload ARM tarballs correctly #355

wants to merge 3 commits into from

Conversation

aneeshusa
Copy link
Contributor

@aneeshusa aneeshusa commented May 3, 2016 •
edited by larsbergstrom
Loading

We keep uploading them to the wrong place on accident.

@larsbergstrom ;)

This change is Reviewable

@larsbergstrom
Copy link
Contributor

Looks good!

[larsberg@lbergstrom Downloads]$ ./upload-arm.sh arm64-trusty-libs_dbus.tgz arm64 v2
Uploading arm64-trusty-libs_dbus.tgz to s3://servo-rust/ARM/arm64-trusty-libs/v2/arm64-trusty-libs-v2.tgz. Proceed? [Y/n]y
WARNING: Module python-magic is not available. Guessing MIME types based on file extensions.
upload: 'arm64-trusty-libs_dbus.tgz' -> 's3://servo-rust/ARM/arm64-trusty-libs/v2/arm64-trusty-libs-v2.tgz'  [part 1 of 3, 15MB] [1 of 1]
 15728640 of 15728640   100% in   18s   811.01 kB/s  done
upload: 'arm64-trusty-libs_dbus.tgz' -> 's3://servo-rust/ARM/arm64-trusty-libs/v2/arm64-trusty-libs-v2.tgz'  [part 2 of 3, 15MB] [1 of 1]
 15728640 of 15728640   100% in   22s   694.62 kB/s  done
upload: 'arm64-trusty-libs_dbus.tgz' -> 's3://servo-rust/ARM/arm64-trusty-libs/v2/arm64-trusty-libs-v2.tgz'  [part 3 of 3, 5MB] [1 of 1]
 6228187 of 6228187   100% in    6s   975.35 kB/s  done
[larsberg@lbergstrom Downloads]$ ./upload-arm.sh armhf-trusty-libs_dbus.tgz armhf v2
Uploading armhf-trusty-libs_dbus.tgz to s3://servo-rust/ARM/armhf-trusty-libs/v2/armhf-trusty-libs-v2.tgz. Proceed? [Y/n]
WARNING: Module python-magic is not available. Guessing MIME types based on file extensions.
upload: 'armhf-trusty-libs_dbus.tgz' -> 's3://servo-rust/ARM/armhf-trusty-libs/v2/armhf-trusty-libs-v2.tgz'  [part 1 of 3, 15MB] [1 of 1]
 15728640 of 15728640   100% in   15s   981.77 kB/s  done
upload: 'armhf-trusty-libs_dbus.tgz' -> 's3://servo-rust/ARM/armhf-trusty-libs/v2/armhf-trusty-libs-v2.tgz'  [part 2 of 3, 15MB] [1 of 1]
 15728640 of 15728640   100% in   15s  1021.19 kB/s  done
upload: 'armhf-trusty-libs_dbus.tgz' -> 's3://servo-rust/ARM/armhf-trusty-libs/v2/armhf-trusty-libs-v2.tgz'  [part 3 of 3, 14MB] [1 of 1]
 14838581 of 14838581   100% in   13s  1067.78 kB/s  done
[larsberg@lbergstrom Downloads]$

@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 4, 2016 •
edited by KiChjang
Loading

Fix the following and then r=me:

[ FAIL ] Bad shebangs found in these files:

         ./scripts/upload-arm.sh

@aneeshusa aneeshusa force-pushed the add-s3-arm-rootfs-upload-script branch from 3d95d77 to 5ed0420 Compare May 4, 2016 00:43
@aneeshusa
Copy link
Contributor Author

Updated the PR.

I also think it would be prudent to delete all the extra copies of our ARM tarballs that are in unused locations, to decrease the confusion factor in the future.

@aneeshusa
Copy link
Contributor Author

I want to update this to change our URL scheme (yet again!) to get rid of the download_name triples in the map.jinja. @larsbergstrom Should I replace them by the name or symlink_name triples?

@larsbergstrom
Copy link
Contributor

@aneeshusa I have no strong opinion - either one would work for me!

@aneeshusa aneeshusa force-pushed the add-s3-arm-rootfs-upload-script branch 2 times, most recently from 00b566d to 533aa76 Compare May 5, 2016 04:53
@aneeshusa aneeshusa changed the title Add script to upload ARM tarballs correctly Simplify ARM triples, add script to upload ARM tarballs correctly May 5, 2016
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #308) made this pull request unmergeable. Please resolve the merge conflicts.

@aneeshusa aneeshusa force-pushed the add-s3-arm-rootfs-upload-script branch from 533aa76 to f97c601 Compare May 5, 2016 21:18
@aneeshusa
Copy link
Contributor Author

@larsbergstrom it seems highfive isn't posting its "New code was committed to pull request." comments, but I rebased and updated this to get rid of download_name. I also did a lot of renaming so please double-check that I didn't miss something!

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #374) made this pull request unmergeable. Please resolve the merge conflicts.

@larsbergstrom
Copy link
Contributor

@aneeshusa Are you expecting that I will have to re-upload the tarballs before this will work correctly? It did not pass the travis build, due to being unable to find and extract the files from the tarballs (if I'm reading the log correctly).

@aneeshusa
Switch from sh to bash to match Servo style guide
354721f 
Originally, I restricted these scripts to pure sh to avoid too many
compatibility issues between Linux and OS X, but I've changed my mind
and now prefer using bash to gain a few nice features.
@aneeshusa
Simplify ARM triples
f3ceb83 
Previouly, we had 'name', 'symlink_name', and 'download_name'.
 - We are changing the S3 URL scheme to make 'download_name' redundant.
 - 'symlink_name' referred to the full target triple, and has been
   replaced with just 'triple'.
 - 'name' referred to an ambiguously shortened triple (which omitted
   the vendor field of 'unknown'), which is used by Ubuntu, and has
   been replaced with 'ubuntu_triple'.

Most of the references have been switched to use just 'triple', which
is the most specific identifier, with 'ubuntu_triple' used where
necessary (references to the /usr/bin/* cross-compilation binaries,
and references to the lib, usr/lib, and usr/include dirs extracted
from the ARM rootfs tarballs).
e Please enter the commit message for your changes. Lines starting
@aneeshusa
Add script to upload ARM tarballs correctly
2a8cfb4 
We keep uploading them to the wrong place on accident.
@aneeshusa aneeshusa force-pushed the add-s3-arm-rootfs-upload-script branch from f97c601 to 2a8cfb4 Compare June 9, 2016 21:44
@aneeshusa
Copy link
Contributor Author

Rebased.

@larsbergstrom yes, in the process of consolidating the triples the URL also changed to be more specific (using the full target triple instead of just armhf). Sorry to make you upload the tarballs again! I see it like versioning the Android downloads.

You can cleanup the tarball from the other places we've uploaded it after landing, though.

@aneeshusa aneeshusa mentioned this pull request Jun 29, 2016
Closed
@larsbergstrom
Copy link
Contributor

I think I'm OK with this.

The only question is: should we move the ARM buckets from the servo-rust S3 bucket to one that's in the Servo AWS account? CC: @edunham

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #420) made this pull request unmergeable. Please resolve the merge conflicts.

@aneeshusa aneeshusa mentioned this pull request Aug 11, 2016
Merged
@jdm jdm closed this Aug 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aneeshusa @larsbergstrom @bors-servo @jdm