Merge pull request #318 from google/smaller-native-images

Use more specific patterns for matching included resources

Author: ChadKillingsworth

.github/workflows/build.yml

@@ -109,12 +109,6 @@ jobs:
           distribution: 'graalvm-community'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: 'true'
-      - name: Setup upx
-        run: |
-          UPX_VERSION=5.0.0
-          curl --fail --show-error --location --remote-name "https://github.com/upx/upx/releases/download/v$UPX_VERSION/upx-$UPX_VERSION-amd64_linux.tar.xz"
-          tar -xf upx-$UPX_VERSION-amd64_linux.tar.xz
-          mv ./upx-$UPX_VERSION-amd64_linux/upx /usr/local/bin/upx
       - name: Download compiler jar
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
         with:
@@ -147,7 +141,6 @@ jobs:
         run: |
           cp ../google-closure-compiler-java/compiler.jar compiler.jar
           yarn run build
-          upx compiler
       - name: Tests
         run: yarn workspaces run test --color
       - name: Upload artifacts
@@ -187,12 +180,6 @@ jobs:
           distribution: 'graalvm-community'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: 'true'
-      - name: Setup upx
-        run: |
-          UPX_VERSION=5.0.0
-          curl --fail --show-error --location --remote-name "https://github.com/upx/upx/releases/download/v$UPX_VERSION/upx-$UPX_VERSION-arm64_linux.tar.xz"
-          tar -xf upx-$UPX_VERSION-arm64_linux.tar.xz
-          mv ./upx-$UPX_VERSION-arm64_linux/upx /usr/local/bin/upx
       - name: Download compiler jar
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
         with:
@@ -225,7 +212,6 @@ jobs:
         run: |
           cp ../google-closure-compiler-java/compiler.jar compiler.jar
           yarn run build
-          upx compiler
       - name: Tests
         run: yarn workspaces run test --color
       - name: Upload artifacts
@@ -263,9 +249,6 @@ jobs:
           distribution: 'graalvm-community'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: 'true'
-#        # See https://github.com/google/closure-compiler-npm/issues/265
-#      - name: Install upx
-#        run: brew install upx
       - name: Download compiler jar
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
         with:
@@ -298,7 +281,6 @@ jobs:
         run: |
           cp ../google-closure-compiler-java/compiler.jar compiler.jar
           yarn run build
-#          upx compiler
       - name: Tests
         run: yarn workspaces run test --color
       - name: Upload artifacts

build-scripts/graal.js

@@ -35,24 +35,18 @@ process.on('unhandledRejection', error => {
 });
 
 const NATIVE_IMAGE_BUILD_ARGS = [
-  '-H:+ReportUnsupportedElementsAtRuntime',
+  '-H:+UnlockExperimentalVMOptions',
   '-H:IncludeResourceBundles=org.kohsuke.args4j.Messages',
   '-H:IncludeResourceBundles=org.kohsuke.args4j.spi.Messages',
   '-H:IncludeResourceBundles=com.google.javascript.jscomp.parsing.ParserConfig',
   '-H:+AllowIncompleteClasspath',
   `-H:ReflectionConfigurationFiles=${path.resolve(__dirname, 'reflection-config.json')}`,
-  '-H:IncludeResources=(externs.zip)|(.*(js|txt|typedast))'.replace(/[\|\(\)]/g, (match) => {
-    if (process.platform === 'win32') {
-      // Escape the '|' character in a  windows batch command
-      // See https://stackoverflow.com/a/16018942/1211524
-      if (match === '|') {
-        return '^^^|';
-      }
-      return `^${match}`;
-    }
-    return '|';
-  }),
+  '-H:IncludeResources=externs\.zip',
+  '-H:IncludeResources=com\/google\/javascript\/.*\.js',
+  '-H:IncludeResources=com\/google\/javascript\/.*\.txt',
+  '-H:IncludeResources=com\/google\/javascript\/.*\.typedast',
   '-H:+ReportExceptionStackTraces',
+  '--report-unsupported-elements-at-runtime',
   '--initialize-at-build-time',
   '--color=always',
   '-jar',