msys2: switch to ucrt64

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 4752c3e24102be75b1196cb033121eeedaf1de3a..4f5c652789f143f3480658b3668f4b6f6dadd268 100644 (file)
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -65,16 +65,16 @@ jobs:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: ucrt64
           install: >-
             base-devel
             subversion
-            mingw64/mingw-w64-x86_64-gcc
-            mingw64/mingw-w64-x86_64-cmake
-            mingw64/mingw-w64-x86_64-zlib
-            mingw64/mingw-w64-x86_64-libuv
-            mingw64/mingw-w64-x86_64-mbedtls
-            mingw64/mingw-w64-x86_64-json-c
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-zlib
+            mingw-w64-ucrt-x86_64-libuv
+            mingw-w64-ucrt-x86_64-mbedtls
+            mingw-w64-ucrt-x86_64-json-c
           update: true
       - name: Build ttyd
         shell: msys2 {0}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 078b385cfc9d41f96300fcafcc1c580ef32ac32b..8195b115c363c587f6af756b1ef4dc8f11220f1e 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,16 +34,16 @@ jobs:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: ucrt64
           install: >-
             base-devel
             subversion
-            mingw64/mingw-w64-x86_64-gcc
-            mingw64/mingw-w64-x86_64-cmake
-            mingw64/mingw-w64-x86_64-zlib
-            mingw64/mingw-w64-x86_64-libuv
-            mingw64/mingw-w64-x86_64-mbedtls
-            mingw64/mingw-w64-x86_64-json-c
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-zlib
+            mingw-w64-ucrt-x86_64-libuv
+            mingw-w64-ucrt-x86_64-mbedtls
+            mingw-w64-ucrt-x86_64-json-c
           update: true
       - name: Build ttyd
         shell: msys2 {0}

diff --git a/scripts/mingw-build.sh b/scripts/mingw-build.sh
index 6366dcbbb08a30d9047affcbaa635d7b66d91632..750d1476f2e6c2210647de536c27234672ff487e 100644 (file)
--- a/scripts/mingw-build.sh
+++ b/scripts/mingw-build.sh
@@ -16,7 +16,7 @@ build_libwebsockets() {
 build_libwebsockets
 
 # workaround for the lib name change
-cp /mingw64/lib/libuv_a.a /mingw64/lib/libuv.a
+cp ${MINGW_PREFIX}/lib/libuv_a.a ${MINGW_PREFIX}/lib/libuv.a
 
 rm -rf build && mkdir -p build && cd build
 cmake -DCMAKE_BUILD_TYPE=RELEASE \