Skip to content

Commit

Permalink
No need for updateKeyRing as of 20200706 runners
Browse files Browse the repository at this point in the history
  • Loading branch information
MSP-Greg committed Jul 13, 2020
1 parent af28fee commit 4f6ebbf
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
10 changes: 6 additions & 4 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,8 @@ __webpack_require__.r(__webpack_exports__);
const fs = __webpack_require__(747)
const core = __webpack_require__(276)

const { download, execSync, execSyncQ, grpSt, grpEnd, getInput, win2nix, updateKeyRing } = __webpack_require__(498)
// , updateKeyRing
const { download, execSync, execSyncQ, grpSt, grpEnd, getInput, win2nix } = __webpack_require__(498)

// group start time
let msSt
Expand Down Expand Up @@ -767,7 +768,7 @@ const run = async () => {
// if (fs.existsSync(bad)) { fs.renameSync(bad, `${bad}_`) }
// })

await updateKeyRing('r21.b39fb11-1')
// await updateKeyRing('r21.b39fb11-1')

if (mingw !== '' || msys2 !== '') {
if (ruby.abiVers >= '2.4.0') {
Expand Down Expand Up @@ -1950,7 +1951,8 @@ __webpack_require__.r(__webpack_exports__);
const fs = __webpack_require__(747)
const core = __webpack_require__(276)

const { execSync, grpSt, grpEnd, getInput, updateKeyRing } = __webpack_require__(498)
// , updateKeyRing
const { execSync, grpSt, grpEnd, getInput } = __webpack_require__(498)

// group start time
let msSt
Expand All @@ -1967,7 +1969,7 @@ const setRuby = (_ruby) => { ruby = _ruby } // eslint-disable-line no-unused-var
const run = async () => {
try {
if (mswin !== '') {
await updateKeyRing('r21.b39fb11-1')
// await updateKeyRing('r21.b39fb11-1')

if (mingw.includes('ragel') && !mswin.includes('ragel')) {
mswin += ' mingw-w64-x86_64-ragel'
Expand Down
2 changes: 1 addition & 1 deletion dist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-ruby-pkgs",
"version": "1.16.0",
"version": "1.17.0",
"description": "Install packages and update builds tools for Ruby",
"main": "index.js",
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions mingw.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
const fs = require('fs')
const core = require('@actions/core')

const { download, execSync, execSyncQ, grpSt, grpEnd, getInput, win2nix, updateKeyRing } = require('./common')
// , updateKeyRing
const { download, execSync, execSyncQ, grpSt, grpEnd, getInput, win2nix } = require('./common')

// group start time
let msSt
Expand Down Expand Up @@ -203,7 +204,7 @@ export const run = async () => {
// if (fs.existsSync(bad)) { fs.renameSync(bad, `${bad}_`) }
// })

await updateKeyRing('r21.b39fb11-1')
// await updateKeyRing('r21.b39fb11-1')

if (mingw !== '' || msys2 !== '') {
if (ruby.abiVers >= '2.4.0') {
Expand Down
5 changes: 3 additions & 2 deletions mswin.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
const fs = require('fs')
const core = require('@actions/core')

const { execSync, grpSt, grpEnd, getInput, updateKeyRing } = require('./common')
// , updateKeyRing
const { execSync, grpSt, grpEnd, getInput } = require('./common')

// group start time
let msSt
Expand All @@ -20,7 +21,7 @@ export const setRuby = (_ruby) => { ruby = _ruby } // eslint-disable-line no-unu
export const run = async () => {
try {
if (mswin !== '') {
await updateKeyRing('r21.b39fb11-1')
// await updateKeyRing('r21.b39fb11-1')

if (mingw.includes('ragel') && !mswin.includes('ragel')) {
mswin += ' mingw-w64-x86_64-ragel'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-ruby-pkgs",
"version": "1.16.0",
"version": "1.17.0",
"description": "Install packages and update builds tools for Ruby",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 4f6ebbf

Please sign in to comment.