windows - do we need cygpath anymore? #12063
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Recent Windows builds appear to not need the Rust directory expanded to a Windows style path, so just use @abs_top_srcdir@ and @abs_top_builddir@ directly. Removed the 2 build lines depending on having cygpath or now.
Doesn't appear to be needed.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #12063 +/- ##
==========================================
- Coverage 83.42% 83.42% -0.01%
==========================================
Files 910 910
Lines 257642 257642
==========================================
- Hits 214949 214934 -15
- Misses 42693 42708 +15
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Don't know why, but my setup still requires it |
|
My runners run as follows: win10mingw64:
script:
- cd %CI_PROJECT_DIR%
- set Path=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\npcap-sdk\x86_64;%Path%
- set PKG_CONFIG_PATH=/c/msys64/mingw64/lib;/c/msys64/mingw64/share;
- bash getsv.sh
- rd suricata /s /q
- md suricata
- tar xzvf suricata.tar.gz -C suricata --strip-components=1
- cd suricata
- bash configure --with-libpcap-libraries=/c/msys64/npcap-sdk/Lib/x64 --with-libpcap-includes=/c/msys64/npcap-sdk/Include --disable-shared --enable-gccprotect
- make -j 8
- ldd src\suricata.exe
- src\suricata --build-info
- jq --version
- python3 ..\suricata-verify\run.py -q
artifacts:
when: on_failure
paths:
- 'suricata-verify\tests\*\output\eve.json'
- 'suricata-verify\tests\*\*\output\eve.json'
tags:
- windows
win10mingw64ut:
script:
- cd %CI_PROJECT_DIR%
- set Path=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\npcap-sdk\x86_64;%Path%
- set PKG_CONFIG_PATH=/c/msys64/mingw64/lib;/c/msys64/mingw64/share;
- rd suricata /s /q
- md suricata
- tar xzvf suricata.tar.gz -C suricata --strip-components=1
- cd suricata
- bash configure --with-libpcap-libraries=/c/msys64/npcap-sdk/Lib/x64 --with-libpcap-includes=/c/msys64/npcap-sdk/Include --disable-shared --enable-unittests --enable-gccprotect
- make -j 8
- src\suricata --build-info
- src\suricata -u -l %TEMP% --fatal-unittests
tags:
- windows |
|
Interesting, really curious how my setup, which uses the GitHub CI stuff as a reference, and GitHub CI differs from your setup. I use Windows 11, GitHub uses |
|
I think my shell is just whatever MS |
|
I guess ideally you'd be able to use only the windows path notation, but at the time I couldn't get it to work. I won't be able to dig into this anytime soon either. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This builds locally for me, and in GitHub CI, where is cygpath really needed?