Skip to content

Commit 2bac2dc

Browse files
author
Adam Simpson
committed
feat: env in travis build
1 parent d3f7682 commit 2bac2dc

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

.travis.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,35 @@ language: rust
22

33
jobs:
44
include:
5-
- env: TARGET=x86_64-unknown-linux-gnu
5+
- env:
6+
OSCAR_NAME="oscar-$TARGET"
7+
TARGET=x86_64-unknown-linux-gnu
68
os: linux
7-
- env: TARGET=x86_64-unknown-linux-musl
9+
- env:
10+
OSCAR_NAME="oscar-$TARGET"
11+
TARGET=x86_64-unknown-linux-musl
812
os: linux
913
addons:
1014
apt:
1115
packages:
1216
- musl-tools
13-
- env: TARGET=arm-unknown-linux-gnueabihf
17+
- env:
18+
OSCAR_NAME="oscar-$TARGET"
19+
TARGET=arm-unknown-linux-gnueabihf
20+
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
1421
os: linux
15-
- env: TARGET=aarch64-unknown-linux-gnu
22+
- env:
23+
OSCAR_NAME="oscar-$TARGET"
24+
TARGET=aarch64-unknown-linux-gnu
1625
os: linux
1726
arch: arm64
18-
- env: TARGET=x86_64-apple-darwin
27+
- env:
28+
OSCAR_NAME="oscar-$TARGET"
29+
TARGET=x86_64-apple-darwin
1930
os: osx
20-
- env: TARGET=x86_64-pc-windows-gnu
31+
- env:
32+
OSCAR_NAME="oscar.exe"
33+
TARGET=x86_64-pc-windows-gnu
2134
os: windows
2235

2336
install: skip
@@ -34,7 +47,6 @@ deploy:
3447
tags: true
3548
provider: releases
3649
skip_cleanup: true
37-
# cleanup: false
3850

3951
branches:
4052
only:

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "oscar"
3-
version = "0.1.16"
3+
version = "0.1.17"
44
authors = ["Adam Simpson <adam@heysparkbox.com>"]
55
edition = "2018"
66
description = "A CLI application to download videos from PBS. Ideally run in cron or another scheduler."

build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ if [ "${TARGET}" = "arm-unknown-linux-gnueabihf" ]
77
then
88
git clone --depth=1 https://github.com/raspberrypi/tools.git /tmp/tools;
99
export PATH=/tmp/tools/arm-bcm2708/arm-linux-gnueabihf/bin:${PATH};
10-
export CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
1110
fi
1211

1312
cargo build --target="${TARGET}" --release
@@ -16,13 +15,11 @@ ls -al ./target/"${TARGET}"/release/
1615

1716
if [ "${TARGET}" = "x86_64-pc-windows-gnu" ]
1817
then
19-
export OSCAR_NAME="oscar.exe"
2018
mv ./target/"${TARGET}"/release/oscar "${OSCAR_NAME}"
2119
fi
2220

2321
if [ "${TARGET}" != "x86_64-pc-windows-gnu" ]
2422
then
25-
export OSCAR_NAME="oscar-${TARGET}"
2623
mv ./target/"${TARGET}"/release/oscar "${OSCAR_NAME}"
2724
fi
2825

0 commit comments

Comments
 (0)