[前][次][番号順一覧][スレッド一覧]

ruby-changes:62535

From: Hiroshi <ko1@a...>
Date: Fri, 7 Aug 2020 12:29:00 +0900 (JST)
Subject: [ruby-changes:62535] 8a99f820ce (master): Use zlib provided by vcpkg in mswin CI (#3397)

https://git.ruby-lang.org/ruby.git/commit/?id=8a99f820ce

From 8a99f820ce208b6d9ddb9d679108b174977514c3 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Fri, 7 Aug 2020 12:28:39 +0900
Subject: 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.

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6bc0fab..eb04db5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,7 +22,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L22
             ${{ 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: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L42
       - 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
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]