Skip to content

Commit d185b09

Browse files
authored
[Github Action] Fix MSYS Paths for g++ and gdb (#1232)
* Find GDB and G++ * Update test/CppTests/TestConfigurations/config_msys_gdb.xml
1 parent 8cdb87b commit d185b09

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/pull-request.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,14 @@ jobs:
7676
update: true
7777
install: >-
7878
mingw-w64-x86_64-toolchain
79-
79+
80+
- shell: msys2 {0}
81+
name: Gather c++ toolchain paths
82+
run: |
83+
cygpath -w $(which g++)
84+
cygpath -w $(which g++)
85+
86+
8087
- run: >
8188
dotnet test ${{ github.workspace }}\bin\DebugAdapterProtocolTests\Debug\CppTests\CppTests.dll --logger "trx;LogFileName=${{ github.workspace }}\bin\DebugAdapterProtocolTests\Debug\CppTests\results.trx"
8289

test/CppTests/TestConfigurations/config_msys_gdb.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<Compiler
1111
Name="GppMingw64"
1212
Type="GPlusPlus"
13-
Path="D:\a\_temp\msys\msys64\mingw64\bin\g++.exe"/>
13+
Path="D:\a\_temp\msys64\mingw64\bin\g++.exe"/>
1414
</Compilers>
1515
<Debuggers>
1616
<Debugger
1717
Name="GdbMingw64"
1818
Type="Gdb_MinGW"
19-
Path="D:\a\_temp\msys\msys64\mingw64\bin\gdb.exe"
19+
Path="D:\a\_temp\msys64\mingw64\bin\gdb.exe"
2020
AdapterPath="OpenDebugAD7.exe"
2121
/>
2222
</Debuggers>

0 commit comments

Comments
 (0)