From 3225432ce4fd63259d83895245f29c8c6e9b930b Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Sun, 13 Nov 2022 16:06:17 +0800 Subject: [PATCH] msys2: switch to ucrt64 --- .github/workflows/backend.yml | 14 +++++++------- .github/workflows/release.yml | 14 +++++++------- scripts/mingw-build.sh | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 4752c3e..4f5c652 100644 --- 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 078b385..8195b11 100644 --- 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 6366dcb..750d147 100644 --- 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 \ -- 2.43.4