Skip to content

Commit ff7f2dc

Browse files
mirabilosmirabilos
authored andcommitted
switch Win32/x86 build from WSL to MSYS2, for now
Vampire/setup-wsl#74
1 parent 632288c commit ff7f2dc

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

.github/workflows/windhoos.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,28 @@
33
"amd64": {
44
"runs-on": "windows-latest",
55
"steps": [
6-
{
7-
"uses": "Vampire/setup-wsl@v5.0.1",
8-
"with": {
9-
"additional-packages": "bc build-essential",
10-
"update": true,
11-
"wsl-version": 1
12-
}
13-
},
146
{
157
"name": "unfuck line endings (GitHub by default converts them on checkout)",
168
"run": "git config --global core.autocrlf false\ngit config --global core.eol lf"
179
},
1810
{
1911
"uses": "actions/checkout@v4.2.2"
2012
},
13+
{
14+
"id": "setup-msys2",
15+
"uses": "msys2/setup-msys2@v2",
16+
"with": {
17+
"install": "bc ed"
18+
}
19+
},
2120
{
2221
"name": "prepare i386 C",
2322
"run": "find-cl.bat x86",
2423
"shell": "cmd"
2524
},
2625
{
2726
"name": "build i386 C",
28-
"run": "mkt-int.bat",
27+
"run": "mkt-int.bat -msys",
2928
"shell": "cmd"
3029
},
3130
{
@@ -35,7 +34,7 @@
3534
},
3635
{
3736
"name": "build amd64 C",
38-
"run": "mkt-int.bat",
37+
"run": "mkt-int.bat -msys",
3938
"shell": "cmd"
4039
},
4140
{
@@ -45,7 +44,7 @@
4544
},
4645
{
4746
"name": "build i386 C++",
48-
"run": "mkt-int.bat -cxx",
47+
"run": "mkt-int.bat -cxx -msys",
4948
"shell": "cmd"
5049
},
5150
{
@@ -55,7 +54,7 @@
5554
},
5655
{
5756
"name": "build amd64 C++",
58-
"run": "mkt-int.bat -cxx",
57+
"run": "mkt-int.bat -cxx -msys",
5958
"shell": "cmd"
6059
},
6160
{

0 commit comments

Comments
 (0)