Skip to content

Commit 394cbc0

Browse files
authored
Revert "Temp fix for vcpkg bug (#11)", For older Rubies, update to openssl-1.1.1.t (#12)
* Revert "Temp fix for vcpkg bug (#11)" This reverts commit 07e16a0. * MSYS2 - use openssl-1.1.1.t - previous was openssl-1.1.1.s
1 parent 07e16a0 commit 394cbc0

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

.github/workflows/mswin.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
$env:VCPKG_ROOT = $env:VCPKG_INSTALLATION_ROOT
3434
cd $env:VCPKG_INSTALLATION_ROOT
3535
git pull -q
36-
C:/msys64/usr/bin/patch.exe -p1 -N --no-backup-if-mismatch -i $env:GITHUB_WORKSPACE/bootstrap-06-22.patch
3736
./bootstrap-vcpkg.bat
3837
echo "`n———————————— ./vcpkg list ————————————"
3938
./vcpkg list

bootstrap-06-22.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

create_gcc_pkg.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ def add_ri2_key
5656
end
5757

5858
def openssl_downgrade
59-
pkg_name = "openssl-1.1.1.s-1-any.pkg.tar.zst"
59+
add_ri2_key
60+
61+
pkg_name = "openssl-1.1.1.t-1-any.pkg.tar.zst"
6062
pkg = "https://github.com/ruby/setup-msys2-gcc/releases/download/msys2-packages/#{PKG_PRE}#{pkg_name}"
6163
pkg_sig = "#{pkg}.sig"
6264

0 commit comments

Comments
 (0)