diff options
| author | ruki <[email protected]> | 2020-07-07 00:42:38 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-07-06 22:15:49 +0800 |
| commit | db721fb3a1a94035a83b91d48dda2558d4bcec9a (patch) | |
| tree | 56b4a152457aa06434838fd3497241070dc742c5 | |
| parent | 91d07ea8a85b996d16060f53f822049fb62fd6e6 (diff) | |
fix windows ci
| -rw-r--r-- | .github/workflows/windows.yml | 7 | ||||
| -rw-r--r-- | scripts/installer.nsi | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a8618f7b5..ba1fa8b00 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -63,18 +63,19 @@ jobs: - name: artifact run: | # build installer - (New-Item ./xmake/winenv/bin -ItemType Directory).FullName + (New-Item ./winenv/bin -ItemType Directory).FullName Invoke-WebRequest "https://github.com/xmake-mirror/gnuwin32-unzip/releases/download/5.51.1/unzip-5.51-1-bin.zip" -UseBasicParsing -OutFile .\unzip.zip Expand-Archive ./unzip.zip -DestinationPath ./unzip Copy-Item ./unzip/bin/unzip.exe ./xmake/winenv/bin Invoke-WebRequest "https://github.com/xmake-io/xmake-win64env/raw/master/bin/curl.exe" -UseBasicParsing -OutFile .\curl.exe Invoke-WebRequest "https://raw.githubusercontent.com/xmake-io/xmake-win64env/master/bin/curl-ca-bundle.crt" -UseBasicParsing -OutFile .\curl-ca-bundle.crt - Copy-Item ./curl.exe ./xmake/winenv/bin - Copy-Item ./curl-ca-bundle.crt ./xmake/winenv/bin + Copy-Item ./curl.exe ./winenv/bin + 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 # archive Copy-Item ./*.md ./xmake + Copy-Item ./winenv ./xmake -Recurse Add-Type -AssemblyName System.Text.Encoding Add-Type -AssemblyName System.IO.Compression.FileSystem class FixedEncoder : System.Text.UTF8Encoding { diff --git a/scripts/installer.nsi b/scripts/installer.nsi index 468d2e4c3..873559961 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -233,6 +233,7 @@ Section "XMake (required)" InstallExeutable File /r /x ".DS_Store" /x "*.swp" "..\xmake\*.*" File "..\*.md" File "..\core\build\xmake.exe" + File /r /x ".DS_Store" "..\winenv" WriteUninstaller "uninstall.exe" |