File tree Expand file tree Collapse file tree 2 files changed +14
-13
lines changed
Expand file tree Collapse file tree 2 files changed +14
-13
lines changed Original file line number Diff line number Diff line change @@ -26,18 +26,18 @@ jobs:
2626 fail-fast : false
2727 matrix :
2828 include :
29- # - os: windows-latest
30- # target: x86_64-pc-windows-msvc
31- # run_cli: "yes"
32- # - os: ubuntu-latest
33- # target: x86_64-unknown-linux-musl
34- # run_cli: "yes"
29+ - os : windows-latest
30+ target : x86_64-pc-windows-msvc
31+ run_cli : " yes"
32+ - os : ubuntu-latest
33+ target : x86_64-unknown-linux-musl
34+ run_cli : " yes"
3535 # - os: macos-latest
3636 # target: x86_64-apple-darwin
3737 # run_cli: "yes"
38- - os : macos-14
39- target : aarch64-apple-darwin
40- run_cli : " yes"
38+ # - os: macos-14
39+ # target: aarch64-apple-darwin
40+ # run_cli: "yes"
4141 steps :
4242 - name : Checkout
4343 uses : actions/checkout@v4
Original file line number Diff line number Diff line change @@ -719,10 +719,11 @@ fn get_python_run_command(env: &PythonEnvironment) -> Vec<String> {
719719 if env. executable . is_none ( ) {
720720 panic ! ( "Conda environment without executable" ) ;
721721 }
722- let conda_exe = match env. manager . clone ( ) {
723- Some ( manager) => manager. executable . to_str ( ) . unwrap_or_default ( ) . to_string ( ) ,
724- None => get_conda_exe ( ) . to_string ( ) ,
725- } ;
722+ let mut conda_exe = get_conda_exe ( ) . to_string ( ) ;
723+
724+ if let Some ( manager) = & env. manager {
725+ conda_exe = manager. executable . to_str ( ) . unwrap_or_default ( ) . to_string ( ) ;
726+ }
726727 if let Some ( name) = env. name . clone ( ) {
727728 return vec ! [
728729 conda_exe,
You can’t perform that action at this time.
0 commit comments