Skip to content

use the gist gem instead of the gist crate #55

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

Merged
merged 3 commits into from
Aug 24, 2016
Merged

use the gist gem instead of the gist crate #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51aabf3
use the gist gem instead of the gist crate
Aug 24, 2016
2a8b2c2
use newer docker image
Aug 24, 2016
0bf085b
set language: ruby on osx only
Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ matrix:
- env: TARGET=i586-unknown-linux-gnu
os: linux
- env: TARGET=i686-apple-darwin
language: ruby
os: osx
- env: TARGET=i686-unknown-linux-gnu
os: linux
Expand All @@ -36,6 +37,7 @@ matrix:
- env: TARGET=thumbv7m-none-eabi
os: linux
- env: TARGET=x86_64-apple-darwin
language: ruby
os: osx
- env: TARGET=x86_64-unknown-linux-gnu
os: linux
Expand Down
17 changes: 10 additions & 7 deletions ci/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ set -ex
. $(dirname $0)/env.sh

install_qemu() {
case $TRAVIS_OS_NAME in
linux)
apt-get update
apt-get install -y --no-install-recommends \
binfmt-support qemu-user-static
;;
esac
if [[ $TRAVIS_OS_NAME = "linux" ]]; then
apt-get update
apt-get install -y --no-install-recommends \
binfmt-support qemu-user-static
fi
}

install_gist() {
gem install gist
}

install_binutils() {
Expand Down Expand Up @@ -45,6 +47,7 @@ install_xargo() {
main() {
if [[ $TRAVIS_OS_NAME == "osx" || ${IN_DOCKER_CONTAINER:-n} == "y" ]]; then
install_qemu
install_gist
install_binutils
install_rust
add_rustup_target
Expand Down
13 changes: 3 additions & 10 deletions ci/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -ex
. $(dirname $0)/env.sh

gist_it() {
gist -ap -f "'$1' from commit '$TRAVIS_COMMIT' on branch '$TRAVIS_BRANCH'"
gist -d "'$TARGET/rustc-builtins.rlib' from commit '$TRAVIS_COMMIT' on branch '$TRAVIS_BRANCH'"
echo "Disassembly available at the above URL."
}

Expand All @@ -16,14 +16,7 @@ inspect() {
$PREFIX$NM -g --defined-only target/**/debug/*.rlib

set +e
case $TRAVIS_OS_NAME in
linux)
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib | gist_it "$TARGET/rustc-builtins.rlib"
;;
osx)
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib
;;
esac
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib | gist_it
set -e

# Check presence of weak symbols
Expand All @@ -49,7 +42,7 @@ run_tests() {

main() {
if [[ $TRAVIS_OS_NAME == "linux" && ${IN_DOCKER_CONTAINER:-n} == "n" ]]; then
local tag=2016-08-22
local tag=2016-08-24

docker run \
--privileged \
Expand Down