Skip to content

Commit

Permalink
rename SYSTEM32 dll's
Browse files Browse the repository at this point in the history
  • Loading branch information
MSP-Greg committed Dec 26, 2021
1 parent 2d1cb87 commit 14de3ca
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions windows.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {

async function setupMingw(version) {
core.exportVariable('MAKE', 'make.exe')
renameSystem32Dlls()

if (common.floatVersion(version) <= 2.3) {
core.exportVariable('SSL_CERT_FILE', certFile)
Expand Down Expand Up @@ -219,6 +220,17 @@ export function addVCVARSEnv() {
return newPathEntries
}

// ssl files cause issues with non RI2 Rubies (<2.4) and ruby/ruby's CI from
// build folder due to dll resolution
function renameSystem32Dlls() {
const sys32 = 'C:\\Windows\\System32\\'
const badFiles = ['libcrypto-1_1-x64.dll', 'libssl-1_1-x64.dll']
badFiles.forEach( (bad) => {
let fn = `${sys32}${bad}`
if (fs.existsSync(fn)) { fs.renameSync(fn, `${fn}_`) }
})
}

// Sets MSYS2 ENV variables set from running `ridk enable`
//
function addRidkEnv(ridk) {
Expand Down

0 comments on commit 14de3ca

Please sign in to comment.