From 5d158428bdaa1050c5ea3d339971a89600d7a857 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Mar 2025 23:03:45 +0800 Subject: add windows 2025 ci --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 68f2e55d7..918827739 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - os: [windows-2019, windows-2022] + os: [windows-2019, windows-2025] arch: [x64, x86, arm64] runs-on: ${{ matrix.os }} -- cgit v1.3.1 From 4a7fa4c90ca066bb67c7f31e0023efd1c6be2bbf Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Mar 2025 23:14:39 +0800 Subject: revert ci --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 918827739..68f2e55d7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - os: [windows-2019, windows-2025] + os: [windows-2019, windows-2022] arch: [x64, x86, arm64] runs-on: ${{ matrix.os }} -- cgit v1.3.1 From abc89af3c14121a048efd346b58c538b7ef90d6f Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 5 Mar 2025 22:46:46 +0800 Subject: fix wine/cl output encoding #6191 --- .github/workflows/windows.yml | 2 +- xmake/modules/private/tools/vstool.lua | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 68f2e55d7..39e29e8dd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -41,7 +41,7 @@ jobs: # Cache xmake dependencies - name: Retrieve xmake cache for packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: xmake-cache key: ${{ matrix.os }}-${{ matrix.arch }} diff --git a/xmake/modules/private/tools/vstool.lua b/xmake/modules/private/tools/vstool.lua index 56601ba6c..d687bb750 100644 --- a/xmake/modules/private/tools/vstool.lua +++ b/xmake/modules/private/tools/vstool.lua @@ -51,7 +51,8 @@ function runv(program, argv, opt) if ok ~= 0 then -- read errors - local outdata = os.isfile(outpath) and io.readfile(outpath, {encoding = "utf16le"}) or nil + local encoding = is_host("windows") and "utf16le" or nil + local outdata = os.isfile(outpath) and io.readfile(outpath, {encoding = encoding}) or nil local errdata = os.isfile(errpath) and io.readfile(errpath) or nil local errors = errdata or "" if #errors:trim() == 0 then @@ -116,7 +117,8 @@ function iorunv(program, argv, opt) -- get output and error data outfile:close() - local outdata = os.isfile(outpath) and io.readfile(outpath, {encoding = "utf16le"}) or nil + local encoding = is_host("windows") and "utf16le" or nil + local outdata = os.isfile(outpath) and io.readfile(outpath, {encoding = encoding}) or nil local errdata = os.isfile(errpath) and io.readfile(errpath) or nil -- remove the temporary output and error file -- cgit v1.3.1 From d922ef40db89324925b398eb0d817cd5ad9e40c8 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 7 Mar 2025 00:46:55 +0800 Subject: switch to windows 2025 --- .github/workflows/windows.yml | 2 +- tests/projects/c++/modules/test_stdmodules.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 39e29e8dd..8d853a0df 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - os: [windows-2019, windows-2022] + os: [windows-2019, windows-2025] arch: [x64, x86, arm64] runs-on: ${{ matrix.os }} diff --git a/tests/projects/c++/modules/test_stdmodules.lua b/tests/projects/c++/modules/test_stdmodules.lua index 34d5400a3..0fcd0c9b1 100644 --- a/tests/projects/c++/modules/test_stdmodules.lua +++ b/tests/projects/c++/modules/test_stdmodules.lua @@ -20,7 +20,7 @@ end function main(t) if is_subhost("windows") then local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "19.0") >= 0 then + if clang and clang.version and semver.compare(clang.version, "20.0") >= 0 then -- clang don't support msstl std modules atm -- os.exec("xmake f --toolchain=clang -c --yes") -- _build() -- cgit v1.3.1