diff options
| author | ruki <[email protected]> | 2020-08-26 23:32:07 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-08-26 23:32:07 +0800 |
| commit | 54b41f1e3c9760b4788851744b2ccdcdf31fce31 (patch) | |
| tree | 1a581272a184e9b04ceb5d85f458427e849d5434 | |
| parent | e0cfa51d2ef245b4d003c2d72ace9781477d26e7 (diff) | |
fix ci
| -rw-r--r-- | .github/workflows/windows.yml | 3 | ||||
| -rw-r--r-- | xmake/platforms/windows/xmake.lua | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b94a731bb..af9f98ce9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -81,6 +81,7 @@ jobs: Copy-Item ./curl-ca-bundle.crt ./winenv/bin $version = (Get-Command xmake/xmake.exe).FileVersionInfo ./nsis/makensis.exe /DMAJOR=$($version.ProductMajorPart) /DMINOR=$($version.ProductMinorPart) /DALTER=$($version.ProductBuildPart) /DBUILD=$($($version.ProductVersion -split '\+')[1]) /D${{ matrix.arch }} .\scripts\installer.nsi + (New-Item ./artifacts/${{env.RELEASE_NAME}} -ItemType Directory).FullName Copy-Item scripts/xmake.exe ./artifacts/${{env.RELEASE_NAME}}/xmake.exe # build installer for tinyc if ("${{ matrix.arch }}" -eq "x64"){ @@ -111,8 +112,6 @@ jobs: Copy-Item ./xmake ./archive/xmake -Recurse [System.IO.Compression.ZipFile]::CreateFromDirectory("$PWD\archive", "$PWD\archive.zip", [System.IO.Compression.CompressionLevel]::Optimal, $false, [FixedEncoder]::new()) (Get-FileHash .\archive.zip -Algorithm SHA256).Hash.ToLower() + " *xmake.zip`n" | Out-File ./shafile -Encoding ASCII -NoNewLine -Append - # copy to artifacts/arch - (New-Item ./artifacts/${{env.RELEASE_NAME}} -ItemType Directory).FullName Copy-Item archive.zip ./artifacts/${{env.RELEASE_NAME}} Copy-Item shafile ./artifacts/${{env.RELEASE_NAME}} diff --git a/xmake/platforms/windows/xmake.lua b/xmake/platforms/windows/xmake.lua index 38ad3746e..3f1e83702 100644 --- a/xmake/platforms/windows/xmake.lua +++ b/xmake/platforms/windows/xmake.lua @@ -48,7 +48,7 @@ platform("windows") end) -- set toolchains - set_toolchains("msvc", "clang", "yasm", "nasm", "cuda", "dlang", "rust", "go", "gfortran", "zig") + set_toolchains("msvc", "clang", "yasm", "nasm", "cuda", "dlang", "rust", "go", "gfortran", "zig", "tinyc") -- set menu set_menu { |