Skip to content

Commit beaeeeb

Browse files
committed
Add RI2 signing key when using native MSYS2 install
Only affects installing MinGW OpenSSL for Ruby 2.4
1 parent 30ee424 commit beaeeeb

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

dist/index.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,14 @@ const openssl = async () => {
610610
let uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.u-1-any.pkg.tar.zst`
611611
let fn = `${dlPath}\\ri2.tar.zst`
612612
msSt = grpSt('install 2.4 OpenSSL')
613+
614+
if (!RELEASE_ASSET) {
615+
// appveyor ri2 package signing key
616+
let key = 'F98B8484BE8BF1C5'
617+
execSync(`bash.exe -c "pacman-key --recv-keys ${key}"`)
618+
execSync(`bash.exe -c "pacman-key --lsign-key ${key}"`)
619+
}
620+
613621
await download(uri, fn)
614622
await download(`${uri}.sig`, `${fn}.sig`)
615623
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)

dist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-ruby-pkgs",
3-
"version": "1.10.0",
3+
"version": "1.11.0",
44
"description": "Install packages and update builds tools for Ruby",
55
"main": "index.js",
66
"scripts": {

mingw.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ const openssl = async () => {
7979
let uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.u-1-any.pkg.tar.zst`
8080
let fn = `${dlPath}\\ri2.tar.zst`
8181
msSt = grpSt('install 2.4 OpenSSL')
82+
83+
if (!RELEASE_ASSET) {
84+
// appveyor ri2 package signing key
85+
let key = 'F98B8484BE8BF1C5'
86+
execSync(`bash.exe -c "pacman-key --recv-keys ${key}"`)
87+
execSync(`bash.exe -c "pacman-key --lsign-key ${key}"`)
88+
}
89+
8290
await download(uri, fn)
8391
await download(`${uri}.sig`, `${fn}.sig`)
8492
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-ruby-pkgs",
3-
"version": "1.10.0",
3+
"version": "1.11.0",
44
"description": "Install packages and update builds tools for Ruby",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)