Skip to content

Commit 25d1610

Browse files
committed
Try #297:
2 parents c1acfbd + 61a7aa6 commit 25d1610

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ matrix:
3636
- env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER
3737
rust: nightly
3838

39+
# Stable, used to produce binary relreases
3940
# Linux
40-
- env: TARGET=i686-unknown-linux-gnu
41+
# - env: TARGET=i686-unknown-linux-gnu
4142
- env: TARGET=i686-unknown-linux-musl
42-
- env: TARGET=x86_64-unknown-linux-gnu
43+
# - env: TARGET=x86_64-unknown-linux-gnu
4344
- env: TARGET=x86_64-unknown-linux-musl
4445

4546
# OSX

ci/before_deploy.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
set -euxo pipefail
22

33
main() {
4-
if [ $TARGET = x86_64-pc-windows-msvc ]; then
5-
cargo=cargo
6-
else
7-
cargo=cross
8-
fi
9-
10-
$cargo rustc --bin svd2rust --target $TARGET --release -- -C lto
4+
cargo rustc --bin svd2rust --target $TARGET --release -- -C lto
115

126
rm -rf stage
137
mkdir stage

ci/install.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ main() {
1010
sort=gsort
1111
fi
1212

13-
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
14-
| cut -d/ -f3 \
15-
| grep -E '^v[0-9.]+$' \
16-
| $sort --version-sort \
17-
| tail -n1)
18-
curl -LSfs https://japaric.github.io/trust/install.sh | \
19-
sh -s -- \
20-
--force \
21-
--git japaric/cross \
22-
--tag $tag
13+
# local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
14+
# | cut -d/ -f3 \
15+
# | grep -E '^v[0-9.]+$' \
16+
# | $sort --version-sort \
17+
# | tail -n1)
18+
# curl -LSfs https://japaric.github.io/trust/install.sh | \
19+
# sh -s -- \
20+
# --force \
21+
# --git japaric/cross \
22+
# --tag $tag
2323

2424
rustup component add rustfmt-preview
2525
}

ci/script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ main() {
2929
return
3030
fi
3131

32-
cross check --target $TARGET
32+
cargo check --target $TARGET
3333

3434
if [ -z ${VENDOR-} ]; then
3535
return
3636
fi
3737

38-
cross build --target $TARGET --release
38+
cargo build --target $TARGET --release
3939

4040
case $TRAVIS_OS_NAME in
4141
linux)

0 commit comments

Comments
 (0)