Skip to content

Commit 3225432

Browse files
committed
msys2: switch to ucrt64
1 parent 25e9522 commit 3225432

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/backend.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ jobs:
6565
- uses: actions/checkout@v3
6666
- uses: msys2/setup-msys2@v2
6767
with:
68-
msystem: MINGW64
68+
msystem: ucrt64
6969
install: >-
7070
base-devel
7171
subversion
72-
mingw64/mingw-w64-x86_64-gcc
73-
mingw64/mingw-w64-x86_64-cmake
74-
mingw64/mingw-w64-x86_64-zlib
75-
mingw64/mingw-w64-x86_64-libuv
76-
mingw64/mingw-w64-x86_64-mbedtls
77-
mingw64/mingw-w64-x86_64-json-c
72+
mingw-w64-ucrt-x86_64-gcc
73+
mingw-w64-ucrt-x86_64-cmake
74+
mingw-w64-ucrt-x86_64-zlib
75+
mingw-w64-ucrt-x86_64-libuv
76+
mingw-w64-ucrt-x86_64-mbedtls
77+
mingw-w64-ucrt-x86_64-json-c
7878
update: true
7979
- name: Build ttyd
8080
shell: msys2 {0}

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ jobs:
3434
- uses: actions/checkout@v3
3535
- uses: msys2/setup-msys2@v2
3636
with:
37-
msystem: MINGW64
37+
msystem: ucrt64
3838
install: >-
3939
base-devel
4040
subversion
41-
mingw64/mingw-w64-x86_64-gcc
42-
mingw64/mingw-w64-x86_64-cmake
43-
mingw64/mingw-w64-x86_64-zlib
44-
mingw64/mingw-w64-x86_64-libuv
45-
mingw64/mingw-w64-x86_64-mbedtls
46-
mingw64/mingw-w64-x86_64-json-c
41+
mingw-w64-ucrt-x86_64-gcc
42+
mingw-w64-ucrt-x86_64-cmake
43+
mingw-w64-ucrt-x86_64-zlib
44+
mingw-w64-ucrt-x86_64-libuv
45+
mingw-w64-ucrt-x86_64-mbedtls
46+
mingw-w64-ucrt-x86_64-json-c
4747
update: true
4848
- name: Build ttyd
4949
shell: msys2 {0}

scripts/mingw-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build_libwebsockets() {
1616
build_libwebsockets
1717

1818
# workaround for the lib name change
19-
cp /mingw64/lib/libuv_a.a /mingw64/lib/libuv.a
19+
cp ${MINGW_PREFIX}/lib/libuv_a.a ${MINGW_PREFIX}/lib/libuv.a
2020

2121
rm -rf build && mkdir -p build && cd build
2222
cmake -DCMAKE_BUILD_TYPE=RELEASE \

0 commit comments

Comments
 (0)