Skip to content

feat: auto-detect MSVC outside VS shell #1587

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

Open
peter-jerry-ye wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: auto-detect MSVC outside VS shell #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@ jobs:
"$env:USERPROFILE\.moon\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
"$env:GITHUB_WORKSPACE\target\debug" | Out-File -FilePath $env:GITHUB_PATH -Append

- name: Setup MSVC
if: ${{ matrix.os == 'windows-latest' }}
uses: ilammy/msvc-dev-cmd@v1

- name: Build
run: cargo build

Expand Down Expand Up @@ -244,9 +240,6 @@ jobs:
"$env:USERPROFILE\.moon\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
"$env:GITHUB_WORKSPACE\target\debug" | Out-File -FilePath $env:GITHUB_PATH -Append

- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1

- name: Build
run: cargo build

Expand Down Expand Up @@ -387,10 +380,6 @@ jobs:
Set-ExecutionPolicy RemoteSigned -Scope CurrentUser; irm https://cli.moonbitlang.com/install/powershell.ps1 | iex
"C:\Users\runneradmin\.moon\bin" | Out-File -FilePath $env:GITHUB_PATH -Append

- name: Setup MSVC
if: ${{ matrix.os == 'windows-latest' }}
uses: ilammy/msvc-dev-cmd@v1

- name: Build
run: cargo build

Expand Down
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 66 additions & 3 deletions crates/moon/src/cli/snapshots/shell_completion_bash.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ _moon() {
moon__help__tool,embed)
cmd="moon__help__tool__embed"
;;
moon__help__tool,env-exec)
cmd="moon__help__tool__env__exec"
;;
moon__help__tool,format-and-diff)
cmd="moon__help__tool__format__and__diff"
;;
Expand Down Expand Up @@ -321,6 +324,9 @@ _moon() {
moon__tool,embed)
cmd="moon__tool__embed"
;;
moon__tool,env-exec)
cmd="moon__tool__env__exec"
;;
moon__tool,format-and-diff)
cmd="moon__tool__format__and__diff"
;;
Expand All @@ -342,6 +348,9 @@ _moon() {
moon__tool__help,embed)
cmd="moon__tool__help__embed"
;;
moon__tool__help,env-exec)
cmd="moon__tool__help__env__exec"
;;
moon__tool__help,format-and-diff)
cmd="moon__tool__help__format__and__diff"
;;
Expand Down Expand Up @@ -1553,7 +1562,7 @@ _moon() {
return 0
;;
moon__help__tool)
opts="format-and-diff format-workspace embed write-tcc-rsp-file build-binary-dep demangle"
opts="format-and-diff format-workspace embed env-exec write-tcc-rsp-file build-binary-dep demangle"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
Expand Down Expand Up @@ -1608,6 +1617,20 @@ _moon() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
moon__help__tool__env__exec)
opts=""
if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
fi
case "${prev}" in
*)
COMPREPLY=()
;;
esac
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
moon__help__tool__format__and__diff)
opts=""
if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
Expand Down Expand Up @@ -2321,7 +2344,7 @@ _moon() {
return 0
;;
moon__tool)
opts="-q -v -h --manifest-path --target-dir --quiet --verbose --trace --dry-run --build-graph --help format-and-diff format-workspace embed write-tcc-rsp-file build-binary-dep demangle help"
opts="-q -v -h --manifest-path --target-dir --quiet --verbose --trace --dry-run --build-graph --help format-and-diff format-workspace embed env-exec write-tcc-rsp-file build-binary-dep demangle help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
Expand Down Expand Up @@ -2432,6 +2455,32 @@ _moon() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
moon__tool__env__exec)
opts="-q -v -h --env-file --manifest-path --target-dir --quiet --verbose --trace --dry-run --build-graph --help <args>..."
if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
fi
case "${prev}" in
--env-file)
COMPREPLY=($(compgen -f "${cur}"))
return 0
;;
--manifest-path)
COMPREPLY=($(compgen -f "${cur}"))
return 0
;;
--target-dir)
COMPREPLY=($(compgen -f "${cur}"))
return 0
;;
*)
COMPREPLY=()
;;
esac
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
moon__tool__format__and__diff)
opts="-q -v -h --old --new --block-style --warn --manifest-path --target-dir --quiet --verbose --trace --dry-run --build-graph --help [ARGS]..."
if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
Expand Down Expand Up @@ -2493,7 +2542,7 @@ _moon() {
return 0
;;
moon__tool__help)
opts="format-and-diff format-workspace embed write-tcc-rsp-file build-binary-dep demangle help"
opts="format-and-diff format-workspace embed env-exec write-tcc-rsp-file build-binary-dep demangle help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
Expand Down Expand Up @@ -2548,6 +2597,20 @@ _moon() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
moon__tool__help__env__exec)
opts=""
if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
fi
case "${prev}" in
*)
COMPREPLY=()
;;
esac
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
moon__tool__help__format__and__diff)
opts=""
if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
Expand Down
21 changes: 21 additions & 0 deletions crates/moon/src/cli/snapshots/shell_completion_elvish.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,7 @@ set edit:completion:arg-completer[moon] = {|@words|
cand format-and-diff 'Format the code and print the difference'
cand format-workspace 'format-workspace'
cand embed 'embed'
cand env-exec 'env-exec'
cand write-tcc-rsp-file 'write-tcc-rsp-file'
cand build-binary-dep 'build-binary-dep'
cand demangle 'Demangle MoonBit symbol names'
Expand Down Expand Up @@ -888,6 +889,20 @@ set edit:completion:arg-completer[moon] = {|@words|
cand -h 'Print help'
cand --help 'Print help'
}
&'moon;tool;env-exec'= {
cand --env-file 'The serialized environment file to merge into the child process'
cand --manifest-path 'Path to `moon.mod.json` or `moon.work` to use as the project manifest (does not change the working directory)'
cand --target-dir 'The target directory. Defaults to `<project-root>/_build`'
cand -q 'Suppress output'
cand --quiet 'Suppress output'
cand -v 'Increase verbosity'
cand --verbose 'Increase verbosity'
cand --trace 'Trace the execution of the program'
cand --dry-run 'Do not actually run the command'
cand --build-graph 'build-graph'
cand -h 'Print help'
cand --help 'Print help'
}
&'moon;tool;write-tcc-rsp-file'= {
cand --manifest-path 'Path to `moon.mod.json` or `moon.work` to use as the project manifest (does not change the working directory)'
cand --target-dir 'The target directory. Defaults to `<project-root>/_build`'
Expand Down Expand Up @@ -933,6 +948,7 @@ set edit:completion:arg-completer[moon] = {|@words|
cand format-and-diff 'Format the code and print the difference'
cand format-workspace 'format-workspace'
cand embed 'embed'
cand env-exec 'env-exec'
cand write-tcc-rsp-file 'write-tcc-rsp-file'
cand build-binary-dep 'build-binary-dep'
cand demangle 'Demangle MoonBit symbol names'
Expand All @@ -944,6 +960,8 @@ set edit:completion:arg-completer[moon] = {|@words|
}
&'moon;tool;help;embed'= {
}
&'moon;tool;help;env-exec'= {
}
&'moon;tool;help;write-tcc-rsp-file'= {
}
&'moon;tool;help;build-binary-dep'= {
Expand Down Expand Up @@ -1112,6 +1130,7 @@ set edit:completion:arg-completer[moon] = {|@words|
cand format-and-diff 'Format the code and print the difference'
cand format-workspace 'format-workspace'
cand embed 'embed'
cand env-exec 'env-exec'
cand write-tcc-rsp-file 'write-tcc-rsp-file'
cand build-binary-dep 'build-binary-dep'
cand demangle 'Demangle MoonBit symbol names'
Expand All @@ -1122,6 +1141,8 @@ set edit:completion:arg-completer[moon] = {|@words|
}
&'moon;help;tool;embed'= {
}
&'moon;help;tool;env-exec'= {
}
&'moon;help;tool;write-tcc-rsp-file'= {
}
&'moon;help;tool;build-binary-dep'= {
Expand Down
Loading
Loading