Merge pull request #247 from google/graal-action

Switch to using the Graal github action

Author: ChadKillingsworth

.github/workflows/build.yml

@@ -75,8 +75,6 @@ jobs:
     env:
       NODE_VERSION: '14.x'
       FORCE_COLOR: '1'
-      GRAAL_VERSION: '22.0.0.2'
-      GRAAL_URL: 'https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz'
     steps:
       - name: Setup Java
         uses: actions/setup-java@v2
@@ -90,6 +88,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          version: '22.2.0'
+          java-version: '17'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup upx
         run: |
           UPX_VERSION=3.96
@@ -141,8 +145,6 @@ jobs:
     env:
       NODE_VERSION: '16.x'
       FORCE_COLOR: '1'
-      GRAAL_VERSION: '22.0.0.2'
-      GRAAL_URL: 'https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-darwin-amd64-22.0.0.2.tar.gz'
     steps:
       - name: Setup Java
         uses: actions/setup-java@v2
@@ -156,6 +158,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          version: '22.2.0'
+          java-version: '17'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install upx
         run: brew install upx
       - name: Download compiler jar
@@ -203,8 +211,6 @@ jobs:
     env:
       NODE_VERSION: '18.x'
       FORCE_COLOR: '1'
-      GRAAL_VERSION: '22.0.0.2'
-      GRAAL_URL: 'https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-windows-amd64-22.0.0.2.zip'
     steps:
       - name: Setup Java
         uses: actions/setup-java@v2
@@ -218,6 +224,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          version: '22.2.0'
+          java-version: '17'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Download compiler jar
         uses: actions/download-artifact@v2
         with:
@@ -243,18 +255,7 @@ jobs:
         run: yarn install --colors=always
       - name: Build image
         working-directory: packages/google-closure-compiler-windows
-        # Enable Visual Studio Build Environment in Powershell
-        # See https://stackoverflow.com/a/2124759/1211524
         run: |
-          pushd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools"
-          cmd /c "VsDevCmd.bat -arch=amd64 & set" |
-          foreach {
-            if ($_ -match "=") {
-              $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
-            }
-          }
-          popd
-          Write-Host "`nVisual Studio 2022 Command Prompt variables set." -ForegroundColor Yellow
           cp ../google-closure-compiler-java/compiler.jar compiler.jar
           yarn run build
       - name: Tests

build-scripts/graal-env.js

@@ -22,16 +22,7 @@
  * Intended to be run with a working directory of the intended package.
  */
 
-const fs = require('fs');
 const path = require('path');
-const {
-  GRAAL_OS,
-  GRAAL_FOLDER,
-  GRAAL_VERSION,
-  GRAAL_PACKAGE_SUFFIX,
-  GRAAL_URL
-} = require('./graal-env');
-const TEMP_PATH = path.resolve(__dirname, '../temp');
 const runCommand = require('./run-command');
 
 // This script should catch and handle all rejected promises.
@@ -41,11 +32,6 @@ process.on('unhandledRejection', error => {
   process.exit(1);
 });
 
-// Build graal from source
-if (!fs.existsSync(TEMP_PATH)) {
-  fs.mkdirSync(TEMP_PATH);
-}
-
 const NATIVE_IMAGE_BUILD_ARGS = [
   '-H:+ReportUnsupportedElementsAtRuntime',
   '-H:IncludeResourceBundles=org.kohsuke.args4j.Messages',
@@ -54,7 +40,7 @@ const NATIVE_IMAGE_BUILD_ARGS = [
   '-H:+AllowIncompleteClasspath',
   `-H:ReflectionConfigurationFiles=${path.resolve(__dirname, 'reflection-config.json')}`,
   '-H:IncludeResources=(externs.zip)|(.*(js|txt|typedast))'.replace(/[\|\(\)]/g, (match) => {
-    if (GRAAL_OS === 'windows') {
+    if (process.platform === 'win32') {
       // Escape the '|' character in a  windows batch command
       // See https://stackoverflow.com/a/16018942/1211524
       if (match === '|') {
@@ -69,45 +55,8 @@ const NATIVE_IMAGE_BUILD_ARGS = [
   '-jar',
   path.resolve(process.cwd(), 'compiler.jar')
 ];
-let buildSteps = Promise.resolve();
-// Download Graal
-const GRAAL_ARCHIVE_FILE = `${GRAAL_FOLDER}.${GRAAL_PACKAGE_SUFFIX}`;
-// Build the compiler native image.
-let pathParts = [TEMP_PATH, `graalvm-ce-java11-${GRAAL_VERSION}`];
-if (GRAAL_OS === 'darwin') {
-  pathParts.push('Contents', 'Home', 'bin');
-} else {
-  pathParts.push('bin');
-}
-const GRAAL_BIN_FOLDER = path.resolve.apply(null, pathParts);
-if (!fs.existsSync(path.resolve(TEMP_PATH, GRAAL_FOLDER))) {
-  const GRAAL_GU_PATH = path.resolve(GRAAL_BIN_FOLDER, `gu${GRAAL_OS === 'windows' ? '.cmd' : ''}`);
-  buildSteps = buildSteps
-      .then(() => {
-        // Download graal and extract the contents
-        if (!fs.existsSync(path.resolve(TEMP_PATH, GRAAL_ARCHIVE_FILE))) {
-          process.stdout.write(`Downloading graal from ${GRAAL_URL}\n`);
-          return runCommand(
-              `curl --fail --show-error --location --progress-bar --output ${GRAAL_ARCHIVE_FILE} ${GRAAL_URL}`,
-              {cwd: TEMP_PATH});
-        }
-      })
-      .then(() => {
-        if (GRAAL_PACKAGE_SUFFIX === 'tar.gz') {
-          return runCommand(`tar -xzf ${GRAAL_ARCHIVE_FILE}`, {cwd: TEMP_PATH});
-        }
-        return runCommand(`7z x -y ${GRAAL_ARCHIVE_FILE}`, {cwd: TEMP_PATH});
-      })
-      .then(() => runCommand(`${GRAAL_GU_PATH} install native-image`));
-}
-
-// Build the compiler native image.
-const GRAAL_NATIVE_IMAGE_PATH = path.resolve(
-    GRAAL_BIN_FOLDER,
-    `native-image${GRAAL_OS === 'windows' ? '.cmd' : ''}`);
 
-buildSteps
-    .then(() => runCommand(GRAAL_NATIVE_IMAGE_PATH, NATIVE_IMAGE_BUILD_ARGS))
+runCommand(`native-image${process.platform === 'win32' ? '.cmd' : ''}`, NATIVE_IMAGE_BUILD_ARGS)
     .catch(e => {
       console.error(e);
       process.exit(1);