Skip to content

Commit 22c694b

Browse files
authored
Merge pull request #50 from zrax/mingw-win-ci
Also update MinGW CI build to use supported Windows runner
2 parents 7cb79c1 + b0e72c5 commit 22c694b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/ci-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
cmake --build . --config Debug --target test
7878
7979
build-mingw:
80-
runs-on: windows-2019
80+
runs-on: windows-latest
8181
steps:
8282
- uses: actions/checkout@v4
8383
with:
@@ -95,7 +95,8 @@ jobs:
9595
matrix:
9696
cfg:
9797
- { mingw: mingw32, arch: i686 }
98-
- { mingw: mingw64, arch: x86_64 }
98+
- { mingw: ucrt64, arch: ucrt-x86_64 }
99+
- { mingw: clang64, arch: clang-x86_64 }
99100
steps:
100101
- uses: actions/checkout@v4
101102
with:

test/test_format.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,10 +1008,10 @@ TEST(format, floating_point)
10081008
EXPECT_EQ(ST_LITERAL("xx16384.00xx"), ST::format("xx{.2f}xx", 16384.0));
10091009
EXPECT_EQ(ST_LITERAL("xx0.02xx"), ST::format("xx{.2f}xx", 0.0234));
10101010

1011-
#if defined(__MINGW32__)
1011+
#if defined(__MINGW32__) && !defined(_UCRT)
10121012
// MSVC uses 3 digits for the exponent by default, up to VC 2013.
1013-
// We don't support MSVC versions older than 2015, but MinGW still
1014-
// uses the old format, presumably for MSVC compatibility.
1013+
// We don't support MSVC versions older than 2015, but MinGW still uses
1014+
// the old format in non-UCRT targets, presumably for MSVC compatibility.
10151015
_set_output_format(_TWO_DIGIT_EXPONENT);
10161016
#endif
10171017

0 commit comments

Comments
 (0)