actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-22 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build: Rm unnecessary env.TOOLCHAIN

Browse source 
Since we build it using +nightly anyway.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-29 19:03:18 +10:00
parent 98d8a96a02
commit 7a7220b1a2
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -105,7 +105,7 @@ jobs:
run: sudo ./ci-scripts/install-deps.sh run: sudo ./ci-scripts/install-deps.sh
- name: Build - name: Build
run: ${{ env.CTOOL }} ${{ env.TOOLCHAIN }} build ${{ env.CARGS }} run: ${{ env.CTOOL }} build ${{ env.CARGS }}
- name: Get output - name: Get output
shell: bash shell: bash

3
ci-scripts/compile-settings.jq
View file

@ -1,6 +1,5 @@
if $for_release then { if $for_release then {
output: "release", output: "release",
toolchain: "+nightly",
profile: "release", profile: "release",
# Use build-std to build a std library optimized for size and abort immediately on abort, # Use build-std to build a std library optimized for size and abort immediately on abort,
# so that format string for `unwrap`/`expect`/`unreachable`/`panic` can be optimized out. # so that format string for `unwrap`/`expect`/`unreachable`/`panic` can be optimized out.
@ -8,7 +7,6 @@ if $for_release then {
features: ($matrix.release_features // []), features: ($matrix.release_features // []),
} else { } else {
output: "debug", output: "debug",
toolchain: "+stable",
profile: "dev", profile: "dev",
args: ($matrix.debug_build_args // ""), args: ($matrix.debug_build_args // ""),
features: ($matrix.debug_features // ["rustls", "fancy-with-backtrace"]), features: ($matrix.debug_features // ["rustls", "fancy-with-backtrace"]),
@ -23,7 +21,6 @@ if $for_release then {
{ {
CBIN: (if ($matrix.target | test("windows")) then "cargo-binstall.exe" else "cargo-binstall" end), CBIN: (if ($matrix.target | test("windows")) then "cargo-binstall.exe" else "cargo-binstall" end),
CTOOL: (if ($matrix."use-cross" // false) then "cross" else "cargo" end), CTOOL: (if ($matrix."use-cross" // false) then "cross" else "cargo" end),
TOOLCHAIN: .toolchain,
COUTPUT: .output, COUTPUT: .output,
CARGS: "--target \($matrix.target) --profile \(.profile) \(.features) \(.args)", CARGS: "--target \($matrix.target) --profile \(.profile) \(.features) \(.args)",
} }