Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use rustup on AppVeyor #703

Merged
merged 3 commits into from
Oct 17, 2018
Merged

Use rustup on AppVeyor #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf3d2fb
Update AppVeyor build script to use rustup.
ecstatic-morse Oct 11, 2018
53e3b39
Use channel not version number for stable rust on AppVeyor.
ecstatic-morse Oct 9, 2018
d8bffeb
Use %USERPROFILE% instead of hardcoded path to .cargo/bin.
ecstatic-morse Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ platform:
environment:
matrix:
- TOOLCHAIN_VERSION: 14.0
RUST: 1.26.0
RUST: stable
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalize AppVeyor in the commit message.

Reorder this commit to come after the switch to rustup.

Include the text "I agree to license my contributions to each file under the terms given at the top of each file I changed." in each commit as described in the Contributing section of the README.

- TOOLCHAIN_VERSION: 14.0
RUST: beta
- TOOLCHAIN_VERSION: 14.0
Expand Down
14 changes: 8 additions & 6 deletions mk/appveyor.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,21 @@ if %ERRORLEVEL% NEQ 0 (
exit 1
)

set RUST_URL=https://static.rust-lang.org/dist/rust-%RUST%-%TARGET_ARCH%-pc-windows-msvc.msi
echo Downloading %RUST_URL%...
mkdir build
powershell -Command "(New-Object Net.WebClient).DownloadFile('%RUST_URL%', 'build\rust-%RUST%-%TARGET_ARCH%-pc-windows-msvc.msi')"
set RUSTUP_URL=https://win.rustup.rs/%TARGET_ARCH%
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalize AppVeyor correctly in the commit message and add the "I agree to license my contributions to each file under the terms given at the top of each file I changed." to each commit.

set RUSTUP_EXE=build\rustup-init-%TARGET_ARCH%.exe
echo Downloading %RUSTUP_URL%...
powershell -Command "(New-Object Net.WebClient).DownloadFile('%RUSTUP_URL%', '%RUSTUP_EXE%')"
if %ERRORLEVEL% NEQ 0 (
echo ...downloading Rust failed.
echo ...downloading rustup failed.
exit 1
)

start /wait msiexec /i build\rust-%RUST%-%TARGET_ARCH%-pc-windows-msvc.msi INSTALLDIR="%TARGET_PROGRAM_FILES%\Rust %RUST%" /quiet /qn /norestart
set TARGET=%TARGET_ARCH%-pc-windows-msvc
%RUSTUP_EXE% -y --default-host %TARGET% --default-toolchain %RUST%
if %ERRORLEVEL% NEQ 0 exit 1

set PATH="%TARGET_PROGRAM_FILES%\Rust %RUST%\bin";%cd%\windows_build_tools;%PATH%
set PATH=%USERPROFILE%\.cargo\bin;%cd%\windows_build_tools;%PATH%
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems reasonable to me.

The first line of the commit should mention AppVeyor and should end in a period.

The commit message should end with the contribution statement from the README.

The commit messages should be wrapped to ~72 characters.


if [%Configuration%] == [Release] set CARGO_MODE=--release

Expand Down