Beta (1.28) toolchain

Author: kornelski

.travis.yml

@@ -37,7 +37,7 @@ matrix:
   - os: osx
     env: TARGET_CPU=nehalem PACKAGE_SUFFIX=osx_10_11-x86_64 NUGET_RUNTIME=osx.10.11-x64 UPLOAD_BUILD=True TARGET=x86_64-apple-darwin FETCH_COMMIT_SUFFIX=mac64
     language: rust
-    rust: nightly-2018-04-04
+    rust: beta
     install:
       - ci/travis_install.sh
       - brew install sccache

README.md

@@ -189,8 +189,8 @@ The [official Dockerfiles](https://github.com/imazen/dockerfiles_imageflow) are
 (tested on Ubuntu 14.04, 16.04, and 18.04.)
 
 ```bash
-#Install Rust Nightly by running
-`curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2018-05-15`
+#Install Rust 1.28+ by running
+`curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain beta`
 #Ensure build tools are installed (git, curl, wget, gcc, g++, nasm, pkg-config, openssl, ca-certificates)
 `sudo apt-get install git wget curl build-essential pkg-config libssl-dev libpng-dev nasm `
 ```
@@ -209,8 +209,8 @@ The [official Dockerfiles](https://github.com/imazen/dockerfiles_imageflow) are
 1. Install [Ubuntu 18.04 from the Windows Store](https://www.microsoft.com/store/productId/9N9TNGVNDL3Q)
 2. Run Ubuntu 18.04 and create your username/password
 3. `sudo apt-get update` to update available packages.
-4. Install Rust Nightly by running
-  `curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2018-05-15`
+4. Install Rust 1.28+ by running
+  `curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain beta`
 5. Ensure build tools are installed (git, curl, wget, gcc, g++, nasm, pkg-config, openssl, ca-certificates)
     `sudo apt-get install git wget curl build-essential pkg-config libssl-dev libpng-dev nasm `
 6. (optional) To use a graphical text editor, you'll need to download imageflow to a "Windows" directory, then map it to a location in Ubuntu.
@@ -225,7 +225,7 @@ The [official Dockerfiles](https://github.com/imazen/dockerfiles_imageflow) are
 2. Install [Git 64-bit](https://git-scm.com/download/win).
 3. `Run As Administrator` the [NASM 64-bit](http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-installer-x64.exe) installer - it will not prompt.
 4. Install [Rust 64-bit](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe) if you want 64-bit Imageflow or [Rust 32-bit](https://static.rust-lang.org/rustup/dist/i686-pc-windows-msvc/rustup-init.exe) if you don't.
-Install toolchain `nightly-2018-05-15` as the default, and confirm adding it to `PATH`.
+Install toolchain `beta` as the default, and confirm adding it to `PATH`.
 5. Open the command line and switch to this repository's root directory
 5. Edit `ci/wintools/SETUP_PATH.bat` to ensure that rust/cargo, nasm, git, and Git/mingw64/bin are all in `%PATH%`.
 7. Run `win_enter_env.bat` to start a sub-shell (edit it if you want a 32-bit build)

appveyor.yml

@@ -3,7 +3,7 @@ build: false
 environment:
     RUST_BACKTRACE: 1
     CARGO_INCREMENTAL: 1
-    RUST_TOOLCHAIN: nightly-2018-04-04
+    RUST_TOOLCHAIN: beta
     VSINSTALL:  "Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build"
     VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
     TARGET_DIR: "target\\"

build.sh

@@ -21,7 +21,7 @@ fi
 
 # You're going to need:
 # clang or gcc 4.8, 4.9, or 5.4
-# Rust nightly
+# Rust beta
 # nasm
 # OpenSSL (on linux)
 # DSSIM
@@ -30,7 +30,7 @@ fi
 
 # Check prerequisites
 command -v zip >/dev/null 2>&1 || { echo -e "'zip' is required, but missing. Try: apt-get install zip\nAborting." >&2; exit 1; }
-command -v cargo >/dev/null 2>&1  || { echo -e "'cargo' is required, but missing. Try: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2018-04-04\nAborting." >&2; exit 1; }
+command -v cargo >/dev/null 2>&1  || { echo -e "'cargo' is required, but missing. Try: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain beta\nAborting." >&2; exit 1; }
 command -v dssim >/dev/null 2>&1  || { echo -e "'dssim' is required, but missing. Try: cargo install dssim\nAborting." >&2; exit 1; }
 command -v nasm >/dev/null 2>&1 || { echo -e "'nasm' is required, but missing. Try: apt-get install nasm\nAborting." >&2; exit 1; }
 

ci/docker/musl/Dockerfile

@@ -56,8 +56,8 @@ ENV SSL_VER=1.0.2j \
 
 
 
-# #Install nightly Rust and make default
-# RUN RUSTVER="nightly-2018-04-04" && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTVER -v \
+# #Install beta Rust and make default
+# RUN RUSTVER="beta" && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTVER -v \
 #     && rustup default $RUSTVER \
 #     && HI=$(rustup which rustc) && HI=${HI%/bin/rustc} && export TOOLCHAIN_DIR=$HI && echo TOOLCHAIN_DIR=$TOOLCHAIN_DIR \
 #     && sudo rm -rf $TOOLCHAIN_DIR/share/doc \
@@ -67,9 +67,9 @@ ENV SSL_VER=1.0.2j \
 #     && rustup show \
 #     && rustc -V
 
-RUN RUSTVER="nightly-2018-04-04" && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTVER -v \
+RUN RUSTVER="beta" && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTVER -v \
 	&& rustup target add x86_64-unknown-linux-musl
-RUN RUSTVER="nightly-2018-04-04" && rustup default $RUSTVER \
+RUN RUSTVER="beta" && rustup default $RUSTVER \
     && rustup show \
     && rustc -V \
     && echo "[build]\ntarget = \"x86_64-unknown-linux-musl\"" > ~/.cargo/config

ci/docker/travis/ubuntu14/Dockerfile

@@ -1,2 +1,2 @@
 FROM imazen/imageflow_build_ubuntu14
-RUN rustup default nightly-2018-04-04
+RUN rustup default beta

ci/docker/travis/ubuntu16/Dockerfile

@@ -1,2 +1,2 @@
 FROM imazen/imageflow_build_ubuntu16
-RUN rustup default nightly-2018-04-04
+RUN rustup default beta

ci/nixtools/install_nightly_rust.sh

@@ -3,4 +3,4 @@
 set -e #Exit on failure.
 set -x
 
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2018-05-15
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain beta

ci/wintools/win_verify_tools.bat

@@ -1,6 +1,6 @@
 
 echo ============ VERIFY TOOLS REPORT ==================
-echo RUST MUST BE NIGHTLY 2018-04-04 or later
+echo RUST MUST BE 1.28-beta or later
 rustc -V
 cargo -V