Update MSYS2 to 2020-05-01

Author: MSP-Greg

.github/workflows/ruby.yml

@@ -74,5 +74,5 @@ jobs:
             ridk version
           }
       - name: gem install openssl
-        if:   (matrix.ruby >= '2.4') && (matrix.ruby != 'mswin')
+        if:   (matrix.ruby >= '2.4') && (matrix.ruby <= '3.2')
         run:  gem install openssl -N

common.js

@@ -14,6 +14,8 @@ const colors = {
 }
 const rst = '\x1b[0m'
 
+export const version = JSON.parse(fs.readFileSync(`${__dirname}\\package.json`, 'utf8')).version
+
 export const download = async (uri, dest, log = true) => {
   // make sure the folder exists
   if (!fs.existsSync(path.dirname(dest))) {

dist/index.js

@@ -398,6 +398,7 @@ module.exports = require("assert");
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "version", function() { return version; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "download", function() { return download; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ruby", function() { return ruby; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "execSync", function() { return execSync; });
@@ -422,6 +423,8 @@ const colors = {
 }
 const rst = '\x1b[0m'
 
+const version = JSON.parse(fs.readFileSync(__webpack_require__.ab + "package.json", 'utf8')).version
+
 const download = async (uri, dest, log = true) => {
   // make sure the folder exists
   if (!fs.existsSync(path.dirname(dest))) {
@@ -711,7 +714,7 @@ const run = async () => {
          * used when MSYS2 install or server have problems
          */
         RELEASE_ASSET = fs.lstatSync('C:\\msys64').isSymbolicLink() ?
-          'msys2-2020-04-22' : null
+          'msys2-2020-05-01' : null
         if (RELEASE_ASSET) {
           msSt = grpSt('Updating MSYS2')
           await installMSYS2()
@@ -1721,7 +1724,7 @@ module.exports = require("fs");
 
     if (core.getInput('ruby-version') !== '') {
       const fn = `${process.env.RUNNER_TEMP}\\setup_ruby.js`
-      common.log('  Running ruby/setup-ruby')
+      common.log(`  Running ruby/setup-ruby ${common.version}`)
       const msSt = performance.now()
       await common.download('https://raw.githubusercontent.com/ruby/setup-ruby/v1/dist/index.js', fn, false)
       await require(fn).run()

dist/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "setup-ruby-pkgs",
+  "version": "1.6.0",
+  "description": "Install packages and update builds tools for Ruby",
+  "main": "index.js",
+  "scripts": {
+    "lint": "eslint *.js",
+    "package": "ncc build index.js -o dist"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MSP-Greg/setup-ruby-pkgs.git"
+  },
+  "keywords": [
+    "actions",
+    "ruby",
+    "setup",
+    "windows",
+    "mingw",
+    "mswin"
+  ],
+  "author": "MSP-Greg",
+  "license": "MIT",
+  "dependencies": {
+    "@actions/core": "^1.2.3",
+    "@actions/http-client": "^1.0.8"
+  }
+}

index.js

@@ -29,7 +29,7 @@
 
     if (core.getInput('ruby-version') !== '') {
       const fn = `${process.env.RUNNER_TEMP}\\setup_ruby.js`
-      common.log('  Running ruby/setup-ruby')
+      common.log(`  Running ruby/setup-ruby ${common.version}`)
       const msSt = performance.now()
       await common.download('https://raw.githubusercontent.com/ruby/setup-ruby/v1/dist/index.js', fn, false)
       await require(fn).run()

mingw.js

@@ -196,7 +196,7 @@ export const run = async () => {
          * used when MSYS2 install or server have problems
          */
         RELEASE_ASSET = fs.lstatSync('C:\\msys64').isSymbolicLink() ?
-          'msys2-2020-04-22' : null
+          'msys2-2020-05-01' : null
         if (RELEASE_ASSET) {
           msSt = grpSt('Updating MSYS2')
           await installMSYS2()