Skip to content

Commit 6288f23

Browse files
author
Jorge Aparicio
authored
Merge pull request #55 from japaric/gist
use the gist gem instead of the gist crate
2 parents a687b97 + 0bf085b commit 6288f23

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ matrix:
1616
- env: TARGET=i586-unknown-linux-gnu
1717
os: linux
1818
- env: TARGET=i686-apple-darwin
19+
language: ruby
1920
os: osx
2021
- env: TARGET=i686-unknown-linux-gnu
2122
os: linux
@@ -36,6 +37,7 @@ matrix:
3637
- env: TARGET=thumbv7m-none-eabi
3738
os: linux
3839
- env: TARGET=x86_64-apple-darwin
40+
language: ruby
3941
os: osx
4042
- env: TARGET=x86_64-unknown-linux-gnu
4143
os: linux

ci/install.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ set -ex
33
. $(dirname $0)/env.sh
44

55
install_qemu() {
6-
case $TRAVIS_OS_NAME in
7-
linux)
8-
apt-get update
9-
apt-get install -y --no-install-recommends \
10-
binfmt-support qemu-user-static
11-
;;
12-
esac
6+
if [[ $TRAVIS_OS_NAME = "linux" ]]; then
7+
apt-get update
8+
apt-get install -y --no-install-recommends \
9+
binfmt-support qemu-user-static
10+
fi
11+
}
12+
13+
install_gist() {
14+
gem install gist
1315
}
1416

1517
install_binutils() {
@@ -45,6 +47,7 @@ install_xargo() {
4547
main() {
4648
if [[ $TRAVIS_OS_NAME == "osx" || ${IN_DOCKER_CONTAINER:-n} == "y" ]]; then
4749
install_qemu
50+
install_gist
4851
install_binutils
4952
install_rust
5053
add_rustup_target

ci/script.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -ex
33
. $(dirname $0)/env.sh
44

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

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

1818
set +e
19-
case $TRAVIS_OS_NAME in
20-
linux)
21-
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib | gist_it "$TARGET/rustc-builtins.rlib"
22-
;;
23-
osx)
24-
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib
25-
;;
26-
esac
19+
$PREFIX$OBJDUMP -Cd target/**/release/*.rlib | gist_it
2720
set -e
2821

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

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

5447
docker run \
5548
--privileged \

0 commit comments

Comments
 (0)