Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ttytm committed Nov 11, 2024
1 parent 0dbf8ef commit 3a7433d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ jobs:
run:
shell: bash
steps:
- run: curl --version
- name: Setup V
run: |
curl -Lo v_windows.zip https://github.com/vlang/v/releases/latest/download/v_windows.zip
curl -LO https://github.com/vlang/v/releases/latest/download/v_windows.zip
7z x v_windows.zip
mv v ~/v
~/v/v symlink
Expand Down Expand Up @@ -49,17 +48,8 @@ jobs:
fail-on-cache-miss: true
- name: Setup V
run: ~/v/v symlink
- shell: cmd
run: dir /s /b %USERPROFILE%
- run: ls -Recurse ~/.vmodules/vibe/curl
- name: Run tests
shell: cmd
run: |
v --version
%USERPROFILE%\.vmodules\vibe\curl\libcurl\bin\curl --version
cd C:%HOMEPATH%\.vmodules
set PATH=%PATH%;%USERPROFILE%\.vmodules\vibe\curl\libcurl\bin
echo %PATH%
dir /s /b
v test %USERPROFILE%\.vmodules\vibe
# v -stats test vibe/src/_tests_get_test.v
6 changes: 1 addition & 5 deletions curl/build.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,10 @@ mut cmd := cli.Command{
$if windows {
setup_windows(silent)!
defer {
// For now, don't automatically update the PATH, as it's easily corrupted and might cause annoyances on a user's machine.
println('\nOn Windows, libcurl requires access to a compatible curl.exe.')
println('A reliable way is to use the curl.exe that is shipped with every libcurl version.')
println("Add '${curl_mod_dir.replace('/', os.path_separator)}\\libcurl\\bin' to your PATH to make it accessible.")
if getenv('CI') != '' {
// For now, don't automatically update PATH outside of CI, as it's
// easily corrupted and might cause annoyances on a users machine.
system('setx PATH "%PATH%;C:\\${vmodules_dir()}\\vibe\\curl\\libcurl\\bin"')
}
}
} $else {
setup(silent)!
Expand Down

0 comments on commit 3a7433d

Please sign in to comment.