Skip to content

Commit 357abed

Browse files
author
Jorge Aparicio
committed
use the gist gem instead of the gist crate
hopefully this will work on osx and will make everything more uniform (appveyor is already using the gem instead of the crate) closes #51
1 parent a687b97 commit 357abed

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dist: trusty
2-
language: generic
2+
language: ruby
33
services: docker
44
sudo: required
55

ci/install.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ 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 install -y --no-install-recommends \
8+
binfmt-support qemu-user-static
9+
fi
10+
}
11+
12+
install_gist() {
13+
gem install gist
1314
}
1415

1516
install_binutils() {
@@ -44,7 +45,9 @@ install_xargo() {
4445

4546
main() {
4647
if [[ $TRAVIS_OS_NAME == "osx" || ${IN_DOCKER_CONTAINER:-n} == "y" ]]; then
48+
apt-get update
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-13
5346

5447
docker run \
5548
--privileged \

0 commit comments

Comments
 (0)