Skip to content

Commit fb04daa

Browse files
committed
trim the target list for CI, give "nice" names
...so our release file list doesn't look so scary from auto-generated files
1 parent 882853f commit fb04daa

File tree

4 files changed

+14
-44
lines changed

4 files changed

+14
-44
lines changed

.travis.yml

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,23 @@ language: rust
66
services: docker
77
sudo: required
88

9-
# TODO Rust builds on stable by default, this can be
10-
# overridden on a case by case basis down below.
11-
129
env:
1310
global:
1411
- CRATE_NAME=codedx-client
1512

1613
matrix:
17-
# TODO These are all the build jobs. Adjust as necessary. Comment out what you don't need
1814
include:
1915
# Linux
20-
# - env: TARGET=i686-unknown-linux-gnu
21-
# - env: TARGET=i686-unknown-linux-musl
22-
- env: TARGET=x86_64-unknown-linux-gnu
23-
- env: TARGET=x86_64-unknown-linux-musl
16+
# GNU and MUSL are interchangeable for our purposes, but MUSL is
17+
# purportedly safer and has a smaller memory footprint. This program
18+
# is I/O-bound, so speed isn't really a factor, so we'll use MUSL.
19+
- env: TARGET=x86_64-unknown-linux-musl TARGET_NICE=linux
20+
# - env: TARGET=x86_64-unknown-linux-gnu TARGET_NICE=gnu-linux
2421

2522
# OSX
26-
# - env: TARGET=i686-apple-darwin
27-
# os: osx
28-
- env: TARGET=x86_64-apple-darwin
23+
- env: TARGET=x86_64-apple-darwin TARGET_NICE=mac
2924
os: osx
3025

31-
# *BSD
32-
# - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
33-
- env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
34-
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
35-
36-
# Other architectures
37-
# - env: TARGET=aarch64-unknown-linux-gnu
38-
# - env: TARGET=armv7-unknown-linux-gnueabihf
39-
# - env: TARGET=mips-unknown-linux-gnu
40-
# - env: TARGET=mips64-unknown-linux-gnuabi64
41-
# - env: TARGET=mips64el-unknown-linux-gnuabi64
42-
# - env: TARGET=mipsel-unknown-linux-gnu
43-
# - env: TARGET=powerpc-unknown-linux-gnu
44-
# - env: TARGET=powerpc64-unknown-linux-gnu
45-
# - env: TARGET=powerpc64le-unknown-linux-gnu
46-
# - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
47-
48-
# Testing other channels
49-
# - env: TARGET=x86_64-unknown-linux-gnu
50-
# rust: nightly
51-
# - env: TARGET=x86_64-apple-darwin
52-
# os: osx
53-
# rust: nightly
54-
5526
before_install:
5627
- set -e
5728
- rustup self update
@@ -76,7 +47,7 @@ deploy:
7647
api_key:
7748
secure: RPi5heDvBOmPFx9zAxI0IngmprsLL5ArErXhEaFh4e+C4CtZbyG9jTJrDta3DWKTLtmGBvbXSxF1UL/cUyBPXVBCS1I1ENenvoB7rshik9UG0m/NMMODaq+x1+vFY1hykuO+HmwQSd4wCDcfRE+xcA8q7dmXQc74EbWNdOUfRWEnY2bhqeVtunnDjR1CTKBHRxlfm66dLdzXXx7t0HjQvoGd6ef3DfT3sCQJ5SX2FCxXTff0Bg6XXacIQb5ikTUgeG2YMUNqpn5tkt3see7lI61kXIQUliEBlHzhNL3GYOAuR24+qCkzi7WTlSj1wtmOBDYtYADpQ0k5ZxYXauT5obPCH0tJJFUjOOHNNSX+zXgYSRZCH3y/kfT/JXZZsOy3YlmhtJAuT9gpgtbGKHvCuhRVzMOEw2At/dpekv4hW4oUTwE6XZChYfdKVBMn2VvwHeccLtB4hotVCy0kODA2HUWGU2KxErQIFhCSHWQooIJG/guDzeQcohhJbm/DTi4nv0zlVYKoq44rIgQODzP4UfVqEkyO6+NuIzPiMrhoZK5DRkHKoBg44co5nWoJoNS6r3j6YyHEwFoOA4loRRBZtfq+JOp2D0q2jAViCbq/iNDd+6gFRoWobsXIAi91ezyRuVfmCtaxfm7eXTdrfklXU87ZPLnz8qFrc1FmIzx6cfs=
7849
file_glob: true
79-
file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
50+
file: $CRATE_NAME-$TRAVIS_TAG-$TARGET_NICE.*
8051
on:
8152
# TODO Here you can pick which targets will generate binary releases
8253
# In this example, there are some targets that are tested using the stable

appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ environment:
1010
# TODO These are all the build jobs. Adjust as necessary. Comment out what you
1111
# don't need
1212
matrix:
13-
# MinGW
14-
# - TARGET: i686-pc-windows-gnu
1513
- TARGET: x86_64-pc-windows-gnu
14+
TARGET_NICE: windows
1615

17-
# MSVC
18-
# - TARGET: i686-pc-windows-msvc
19-
- TARGET: x86_64-pc-windows-msvc
16+
# MSVC is the dynamically-linked version, and requires you to have visual studio installed.
17+
# The resulting executable is smaller, but less portable.
18+
# - TARGET: x86_64-pc-windows-msvc
19+
# TARGET_NICE: windows-msvc
2020

2121
# Testing other channels
2222
# - TARGET: x86_64-pc-windows-gnu

ci/before_deploy.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ Set-Location $ENV:Temp
88
New-Item -Type Directory -Name $STAGE
99
Set-Location $STAGE
1010

11-
$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip"
11+
$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET_NICE).zip"
1212

13-
# TODO Update this to package the right artifacts
1413
Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\codedx-client.exe" '.\'
1514

1615
7z a "$ZIP" *

ci/before_deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ main() {
2424
cp target/$TARGET/release/codedx-client $stage/
2525

2626
cd $stage
27-
tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
27+
tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET_NICE.tar.gz *
2828
cd $src
2929

3030
rm -rf $stage

0 commit comments

Comments
 (0)