summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-10-01 00:58:47 +0800
committerruki <[email protected]>2020-10-01 00:58:47 +0800
commit4506160a7ecbc7fe7ae00e5d56eb60f4cc0604b1 (patch)
tree91cc271fd0bb07fa0ad1c10e715909047e7292ed
parent4ff4c3e62301f1f67f3f34bac9420cd55a62c56a (diff)
fix ci for 7zip
-rw-r--r--.appveyor.yml4
-rw-r--r--.github/workflows/windows.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index ad64f604b..3d89a3303 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,8 +24,8 @@ install:
# 7zip
- ps: Invoke-WebRequest "https://github.com/xmake-mirror/7zip/releases/download/19.00/7z19.00-$($env:platform).zip" -UseBasicParsing -OutFile .\7zip.zip
- ps: Expand-Archive ./7zip.zip -DestinationPath ./7zip
- - ps: Copy-Item ./7zip/bin/7z.exe ./winenv/bin
- - ps: Copy-Item ./7zip/bin/7z.dll ./winenv/bin
+ - ps: Copy-Item ./7zip/7z.exe ./winenv/bin
+ - ps: Copy-Item ./7zip/7z.dll ./winenv/bin
# curl
- ps: Invoke-WebRequest "https://github.com/xmake-io/xmake-win$(if ($env:platform -eq 'x64') { '64' } else { '32' })env/raw/master/bin/curl.exe" -UseBasicParsing -OutFile .\curl.exe
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/xmake-io/xmake-win$(if ($env:platform -eq 'x64') { '64' } else { '32' })env/master/bin/curl-ca-bundle.crt" -UseBasicParsing -OutFile .\curl-ca-bundle.crt
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9fdbd5df7..9fbc35ce2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -74,8 +74,8 @@ jobs:
(New-Item ./winenv/bin -ItemType Directory).FullName
Invoke-WebRequest "https://github.com/xmake-mirror/7zip/releases/download/19.00/7z19.00-${{ matrix.arch }}.zip" -UseBasicParsing -OutFile .\7zip.zip
Expand-Archive ./7zip.zip -DestinationPath ./7zip
- Copy-Item ./7zip/bin/7z.exe ./winenv/bin
- Copy-Item ./7zip/bin/7z.dll ./winenv/bin
+ Copy-Item ./7zip/7z.exe ./winenv/bin
+ Copy-Item ./7zip/7z.dll ./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 ./winenv/bin