Merge pull request #9 from DeLaGuardo/fix-gu

Upgrade deps and add GRAALVM_HOME env
DeLaGuardo · Dec 26, 2020 · b990167 · b990167
2 parents 8bbfe44 + ca50b61
commit b990167
Show file tree

Hide file tree

Showing 10 changed files with 221 additions and 246 deletions.
diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml
@@ -4,13 +4,27 @@ on: [push]
 
 jobs:
   simple:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        gu-binary: [gu, gu.cmd]
+        exclude:
+          - os: ubuntu-latest
+            gu-binary: gu.cmd
+          - os: macos-latest
+            gu-binary: gu.cmd
+          - os: windows-latest
+            gu-binary: gu
     steps:
       - name: Setup GraalVM
         uses: DeLaGuardo/setup-graalvm@master
         with:
-          graalvm-version: 19.3.0.java8
+          graalvm-version: 20.3.0.java11
 
-      - name: Check binary
+      - name: Check java binary
+        run: java -version
+
+      - name: Check gu binary
         run: |
-          java -version
+          ${{ matrix.gu-binary }} install native-image
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/sourcemap-register.js b/dist/sourcemap-register.js
@@ -3847,23 +3847,23 @@ exports.SourceMapConsumer = __webpack_require__(327).SourceMapConsumer;
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("fs");
+module.exports = require("fs");;
 
 /***/ }),
 
 /***/ 282:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("module");
+module.exports = require("module");;
 
 /***/ }),
 
 /***/ 622:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("path");
+module.exports = require("path");;
 
 /***/ })
 

diff --git a/lib/installer.js b/lib/installer.js
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -93,6 +93,7 @@ function getGraalVM(version) {
         const extendedJavaHome = `JAVA_HOME_${version}`;
         core.exportVariable('JAVA_HOME', toolPath);
         core.exportVariable(extendedJavaHome, toolPath);
+        core.exportVariable('GRAALVM_HOME', toolPath);
         core.addPath(path.join(toolPath, 'bin'));
     });
 }

diff --git a/lib/setup-graalvm.js b/lib/setup-graalvm.js
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };