From c0559f1b80d9bb446ad7275bc824171cec0cd6b2 Mon Sep 17 00:00:00 2001 From: boasting-squirrel Date: Sat, 23 Feb 2019 19:13:37 +0100 Subject: Updated travis.yml to use nightly --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 061b0fe..0ec4988 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ language: rust -rust: - - stable - - beta - - nightly +rust: nightly addons: apt: @@ -16,7 +13,9 @@ addons: matrix: allow_failures: - - rust: nightly + - rust: + - stable + - beta include: - env: - TARGET=x86_64-unknown-linux-musl @@ -63,4 +62,4 @@ deploy: on: branch: master tags: true - condition: $TRAVIS_RUST_VERSION = stable && -n $TARGET + condition: $TRAVIS_RUST_VERSION = nightly && -n $TARGET -- cgit v1.2.3 From e601cf8ce9cdf84cf06d80843c0b553f9bbfbe46 Mon Sep 17 00:00:00 2001 From: boasting-squirrel Date: Sat, 23 Feb 2019 20:55:46 +0100 Subject: Re-added stable and beta in travis.yml --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 0ec4988..81449bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: rust -rust: nightly +rust: + - stable + - beta + - nightly addons: apt: -- cgit v1.2.3 From 6aff9bc31f84a088e3225a745565a6d300b03849 Mon Sep 17 00:00:00 2001 From: boasting-squirrel Date: Sat, 23 Feb 2019 21:09:53 +0100 Subject: Fixed allow_failures syntax in travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 81449bd..abcd739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,8 @@ addons: matrix: allow_failures: - - rust: - - stable - - beta + - rust: stable + - rust: beta include: - env: - TARGET=x86_64-unknown-linux-musl -- cgit v1.2.3 From ce585a3fd74e9455309ea638a0d7a6271b4acd2f Mon Sep 17 00:00:00 2001 From: boasting-squirrel Date: Sun, 24 Feb 2019 17:07:01 +0100 Subject: use nightly in matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index abcd739..fd117be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ matrix: - rust: stable - rust: beta include: + - rust: nightly - env: - TARGET=x86_64-unknown-linux-musl - BIN_NAME=miniserve -- cgit v1.2.3 From ec2f399643c8a174a6f937b71afe524f44b5f462 Mon Sep 17 00:00:00 2001 From: boasting-squirrel Date: Sun, 24 Feb 2019 18:34:45 +0100 Subject: Fixed matrix include --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index fd117be..01304f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,18 +20,20 @@ matrix: - rust: beta include: - rust: nightly - - env: + env: - TARGET=x86_64-unknown-linux-musl - BIN_NAME=miniserve - PROPER_NAME=miniserve-linux os: linux - - env: + - rust: nightly + env: - TARGET=x86_64-pc-windows-gnu - BIN_NAME=miniserve.exe - PROPER_NAME=miniserve-win.exe - RUSTFLAGS="-C linker=x86_64-w64-mingw32-gcc" os: linux - - env: + - rust: nightly + env: - TARGET=x86_64-apple-darwin - BIN_NAME=miniserve - PROPER_NAME=miniserve-osx -- cgit v1.2.3 From 0ed77e10deccd46a7c73e5a532e26c8a314bc29b Mon Sep 17 00:00:00 2001 From: boasting-squirrel Date: Sun, 24 Feb 2019 18:39:35 +0100 Subject: Fixed indentation in travis.yml --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 01304f0..742dd83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,22 +21,22 @@ matrix: include: - rust: nightly env: - - TARGET=x86_64-unknown-linux-musl - - BIN_NAME=miniserve - - PROPER_NAME=miniserve-linux + - TARGET=x86_64-unknown-linux-musl + - BIN_NAME=miniserve + - PROPER_NAME=miniserve-linux os: linux - rust: nightly env: - - TARGET=x86_64-pc-windows-gnu - - BIN_NAME=miniserve.exe - - PROPER_NAME=miniserve-win.exe - - RUSTFLAGS="-C linker=x86_64-w64-mingw32-gcc" + - TARGET=x86_64-pc-windows-gnu + - BIN_NAME=miniserve.exe + - PROPER_NAME=miniserve-win.exe + - RUSTFLAGS="-C linker=x86_64-w64-mingw32-gcc" os: linux - rust: nightly env: - - TARGET=x86_64-apple-darwin - - BIN_NAME=miniserve - - PROPER_NAME=miniserve-osx + - TARGET=x86_64-apple-darwin + - BIN_NAME=miniserve + - PROPER_NAME=miniserve-osx os: osx before_install: -- cgit v1.2.3