summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-08-07 12:28:39 +0900
committerGitHub <noreply@github.com>2020-08-07 12:28:39 +0900
commit8a99f820ce208b6d9ddb9d679108b174977514c3 (patch)
tree857d314ac1f757ee684d6676ff5e166e0403338b /.github
parent429efce4ede0828eda450279ca3f7ccffc388211 (diff)
Use zlib provided by vcpkg in mswin CI (#3397)
* Revert "mswin build - install src zlib files after checkout" This reverts commit b6175c9e4fe25b978252d8998fe791d65d998fc5. * Revert "mswin build - install src zlib files" This reverts commit bf758ef8b4e2895bf71a611a7ab2a4f236e260ea.
Notes
Notes: Merged-By: hsbt <hsbt@ruby-lang.org>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/windows.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6bc0fab387..eb04db5123 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,7 +22,7 @@ jobs:
${{ runner.os }}-vcpkg-download-
- name: Install libraries with vcpkg
run: |
- vcpkg --triplet x64-windows install readline
+ vcpkg --triplet x64-windows install readline zlib
- uses: actions/cache@v2
with:
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
@@ -42,11 +42,6 @@ jobs:
- run: ./src/tool/actions-commit-info.sh
shell: bash
id: commit_info
- - name: Install zlib
- run: |
- $zlib = 'zlib1211.zip'
- curl -fsSL -o $zlib --retry 10 https://zlib.net/$zlib
- &'C:\Program Files\7-Zip\7z.exe' x -osrc/ext/zlib $zlib
- run: md build
shell: cmd
- name: Configure