More OpenSSL

MSP-Greg · MSP-Greg · commit de584b2e508d · 2020-04-22T15:03:08.000-05:00
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -74,5 +74,5 @@ jobs:
             ridk version
           }
       - name: gem install openssl
-        if:   matrix.ruby >= '2.4'
+        if:   (matrix.ruby >= '2.4') && (matrix.ruby != 'mswin')
         run:  gem install openssl -N
diff --git a/dist/index.js b/dist/index.js
@@ -598,8 +598,8 @@ const openssl = async () => {
     execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
     execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
     grpEnd(msSt)
-    mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
   }
+  mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
 }
 
 // Updates MSYS2 MinGW gcc items
diff --git a/mingw.js b/mingw.js
@@ -83,8 +83,8 @@ const openssl = async () => {
     execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
     execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
     grpEnd(msSt)
-    mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
   }
+  mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
 }
 
 // Updates MSYS2 MinGW gcc items

Original file line number	Diff line number	Diff line change
`@@ -74,5 +74,5 @@ jobs:`
`74`	`74`	`ridk version`
`75`	`75`	`}`
`76`	`76`	`- name: gem install openssl`
`77`		`- if: matrix.ruby >= '2.4'`
	`77`	`+ if: (matrix.ruby >= '2.4') && (matrix.ruby != 'mswin')`
`78`	`78`	`run: gem install openssl -N`
Original file line number	Diff line number	Diff line change
`@@ -598,8 +598,8 @@ const openssl = async () => {`
`598`	`598`	execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
`599`	`599`	execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
`600`	`600`	`grpEnd(msSt)`
`601`		`- mingw = mingw.replace(/\bopenssl\b/gi, '').trim()`
`602`	`601`	`}`
	`602`	`+ mingw = mingw.replace(/\bopenssl\b/gi, '').trim()`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`// Updates MSYS2 MinGW gcc items`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ const openssl = async () => {`
`83`	`83`	execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
`84`	`84`	execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
`85`	`85`	`grpEnd(msSt)`
`86`		`- mingw = mingw.replace(/\bopenssl\b/gi, '').trim()`
`87`	`86`	`}`
	`87`	`+ mingw = mingw.replace(/\bopenssl\b/gi, '').trim()`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// Updates MSYS2 MinGW gcc items`