Compare commits
5 Commits
v10.1.0-cd
...
v10.1.0-cd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8748b004b | ||
|
|
16953409fd | ||
|
|
c85adb8980 | ||
|
|
91554cac56 | ||
|
|
7256aaffc8 |
11
.github/workflows/check-and-lint.yaml
vendored
11
.github/workflows/check-and-lint.yaml
vendored
@@ -10,6 +10,7 @@ name: Check and Lint
|
|||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
name: Check
|
name: Check
|
||||||
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: [ ubuntu-latest, macos-latest, windows-latest ]
|
platform: [ ubuntu-latest, macos-latest, windows-latest ]
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
@@ -26,6 +27,7 @@ jobs:
|
|||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
name: Rustfmt
|
name: Rustfmt
|
||||||
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: [ ubuntu-latest, macos-latest, windows-latest ]
|
platform: [ ubuntu-latest, macos-latest, windows-latest ]
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
@@ -44,6 +46,7 @@ jobs:
|
|||||||
|
|
||||||
clippy:
|
clippy:
|
||||||
name: Clippy
|
name: Clippy
|
||||||
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: [ ubuntu-latest, macos-latest, windows-latest ]
|
platform: [ ubuntu-latest, macos-latest, windows-latest ]
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
@@ -54,13 +57,13 @@ jobs:
|
|||||||
toolchain: stable
|
toolchain: stable
|
||||||
components: clippy
|
components: clippy
|
||||||
override: true
|
override: true
|
||||||
- uses: actions-rs/clippy-check@v1
|
- uses: actions-rs/cargo@v1.0.1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
command: clippy
|
||||||
args: --all-targets --locked -- -D warnings
|
args: --all-targets --locked -- -D warnings
|
||||||
name: Clippy Output
|
name: Clippy Output
|
||||||
- uses: actions-rs/clippy-check@v1
|
- uses: actions-rs/cargo@v1.0.1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
command: clippy
|
||||||
args: --all-targets --locked --all-features -- -D warnings
|
args: --all-targets --locked --all-features -- -D warnings
|
||||||
name: Clippy (All features) Output
|
name: Clippy (All features) Output
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn get_wsl_distributions(wsl: &Path) -> Result<Vec<String>> {
|
fn get_wsl_distributions(wsl: &Path) -> Result<Vec<String>> {
|
||||||
let output = Command::new(wsl).args(["--list", "-q"]).check_output()?;
|
let output = Command::new(&wsl).args(["--list", "-q"]).check_output()?;
|
||||||
Ok(output
|
Ok(output
|
||||||
.lines()
|
.lines()
|
||||||
.filter(|s| !s.is_empty())
|
.filter(|s| !s.is_empty())
|
||||||
@@ -94,7 +94,7 @@ fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> R
|
|||||||
|
|
||||||
pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> {
|
pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> {
|
||||||
let wsl = require("wsl")?;
|
let wsl = require("wsl")?;
|
||||||
let wsl_distributions = get_wsl_distributions(wsl)?;
|
let wsl_distributions = get_wsl_distributions(&wsl)?;
|
||||||
let mut ran = false;
|
let mut ran = false;
|
||||||
|
|
||||||
debug!("WSL distributions: {:?}", wsl_distributions);
|
debug!("WSL distributions: {:?}", wsl_distributions);
|
||||||
|
|||||||
Reference in New Issue
Block a user