Commitfca996e

authored

ci: Install latest rust toolchain (#373)

* ci: Install latest rust toolchain* ci: Use rust target based on toolchain* ci: fix PR test workflow

1 parent03b31f0 commitfca996eCopy full SHA for fca996e

File tree

+22

-29

lines changed

+22

-29

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@ jobs:`
`22`	`22`	`run:\|`
`23`	`23`	`chmod +x ci/buildvars.sh`
`24`	`24`	`ci/buildvars.sh`
`25`		`- -uses:actions-rs/toolchain@v1`
`26`		`-with:`
`27`		`-toolchain:stable`
	`25`	`+ -name:Install Rust`
	`26`	`+uses:dtolnay/rust-toolchain@stable`
`28`	`27`	`-name:build`
`29`	`28`	`uses:actions-rs/cargo@v1`
`30`	`29`	`with:`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,7 @@ jobs:`
`49`	`49`	`./target`
`50`	`50`	`key:${{ matrix.rust }}-cargocache-${{ hashFiles('Cargo.lock') }}`
`51`	`51`
`52`		`- -name:Install Rust`
`53`		`-run:\|`
`54`		`- rustup default stable`
`55`		`- rustup target add ${{ matrix.rust }}`
	`52`	`+ -uses:dtolnay/rust-toolchain@stable`
`56`	`53`
`57`	`54`	`-name:Install MUSL tools`
`58`	`55`	`run:sudo apt update && sudo apt install musl-tools -y`
`@@ -107,7 +104,9 @@ jobs:`
`107`	`104`	`if:runner.os == 'Linux'`
`108`	`105`
`109`	`106`	`-name:Install Rust`
`110`		`-run:rustup target add ${{ matrix.rust }}`
	`107`	`+uses:dtolnay/rust-toolchain@stable`
	`108`	`+with:`
	`109`	`+targets:${{ matrix.rust }}`
`111`	`110`
`112`	`111`	`-name:Make bundle`
`113`	`112`	`run:make bundle`

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,29 +15,27 @@ jobs:`
`15`	`15`	`include:`
`16`	`16`	`-build:linux-stable`
`17`	`17`	`os:ubuntu-latest`
`18`		`-rust:stable`
	`18`	`+rust:x86_64-unknown-linux-gnu`
`19`	`19`	`-build:macos-stable`
`20`	`20`	`os:macos-latest`
`21`		`-rust:stable`
	`21`	`+rust:x86_64-apple-darwin`
`22`	`22`	`-build:windows-stable`
`23`	`23`	`os:windows-latest`
`24`		`-rust:stable`
	`24`	`+rust:x86_64-pc-windows-msvc`
`25`	`25`
`26`	`26`	`steps:`
`27`	`27`	`-name:Checkout code`
`28`	`28`	`uses:actions/checkout@v2`
`29`	`29`	`with:`
`30`	`30`	`fetch-depth:2`
	`31`	`+ -name:Install Rust`
	`32`	`+uses:dtolnay/rust-toolchain@stable`
	`33`	`+with:`
	`34`	`+targets:${{ matrix.rust }}`
`31`	`35`	`-name:Setup environment`
`32`	`36`	`run:\|`
`33`	`37`	`chmod +x ci/buildvars.sh`
`34`	`38`	`ci/buildvars.sh`
`35`		`-`
`36`		`- -name:Install Rust`
`37`		`-run:\|`
`38`		`- rustup update ${{ matrix.rust }} --no-self-update`
`39`		`- rustup update`
`40`		`- rustup default ${{ matrix.rust }}`
`41`	`39`	`if:env.BUILD == 'true'`
`42`	`40`	`-name:Run Tests`
`43`	`41`	`run:make test`

Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ jobs:`
`78`	`78`	`key:${{ matrix.rust }}-cargocache-${{ hashFiles('Cargo.lock') }}`
`79`	`79`
`80`	`80`	`-name:Install Rust`
`81`		`-run:\|`
`82`		`- rustup default stable`
`83`		`-rustup target add ${{ matrix.rust }}`
	`81`	`+uses:dtolnay/rust-toolchain@stable`
	`82`	`+with:`
	`83`	`+targets:${{ matrix.rust }}`
`84`	`84`
`85`	`85`	`-name:Run Tests`
`86`	`86`	`run:make test`
`@@ -117,10 +117,9 @@ jobs:`
`117`	`117`	`key:${{ matrix.rust }}-cargocache-${{ hashFiles('Cargo.lock') }}`
`118`	`118`
`119`	`119`	`-name:Install Rust`
`120`		`-run:\|`
`121`		`- rustup self update`
`122`		`- rustup default stable`
`123`		`- rustup target add ${{ matrix.rust }}`
	`120`	`+uses:dtolnay/rust-toolchain@stable`
	`121`	`+with:`
	`122`	`+targets:${{ matrix.rust }}`
`124`	`123`
`125`	`124`	`-name:Run Tests`
`126`	`125`	`run:make test`
`@@ -143,7 +142,6 @@ jobs:`
`143`	`142`	`uses:actions/checkout@v2`
`144`	`143`	`with:`
`145`	`144`	`fetch-depth:2`
`146`		`-`
`147`	`145`	`-name:Setup environment`
`148`	`146`	`run:\|`
`149`	`147`	`chmod +x ci/setvars.sh`
`@@ -159,10 +157,9 @@ jobs:`
`159`	`157`	`key:${{ matrix.rust }}-cargocache-${{ hashFiles('Cargo.lock') }}`
`160`	`158`
`161`	`159`	`-name:Install Rust`
`162`		`-run:\|`
`163`		`- rustup self update`
`164`		`- rustup default stable`
`165`		`- rustup target add ${{ matrix.rust }}`
	`160`	`+uses:dtolnay/rust-toolchain@stable`
	`161`	`+with:`
	`162`	`+targets:${{ matrix.rust }}`
`166`	`163`
`167`	`164`	`-name:Run Tests`
`168`	`165`	`run:make test`

Comments

(0)