Bump version to 1.3.1.

Dependabot couldn't find the original pull request head commit, d99c250780f60ae25820f76a799d34572762727f.

.github/workflows/ci.yml

@@ -90,7 +90,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           components: ${{ matrix.components }}
           gds-token: ${{ matrix.set-gds-token && secrets.GDS_TOKEN || '' }}
-        if: env.PASSES_GDS_TOKEN_CHECK
+        if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' }}
       - name: Check environment
         run: |
           echo "GRAALVM_HOME: $GRAALVM_HOME"
@@ -103,14 +103,14 @@ jobs:
           java --version
           java --version | grep "GraalVM" || exit 34
           native-image --version
-        if: runner.os != 'Windows' && env.PASSES_GDS_TOKEN_CHECK
+        if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os != 'Windows' }}
       - name: Check Windows environment
         run: |
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
           echo "JAVA_HOME: $env:JAVA_HOME"
           java --version
           native-image --version
-        if: runner.os == 'Windows' && env.PASSES_GDS_TOKEN_CHECK
+        if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os == 'Windows' }}
 
   test-action-ce: # make sure the action works on a clean machine without building
     needs: test-action
@@ -172,7 +172,7 @@ jobs:
           if [[ "${{ matrix.java-version }}" != "dev" ]]; then
             gu list
           fi
-        if: runner.os != 'Windows'
+        if: ${{ runner.os != 'Windows' }}
       - name: Check Windows environment
         run: |
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
@@ -180,13 +180,16 @@ jobs:
           java -version
           native-image --version
           gu.cmd remove native-image
-        if: runner.os == 'Windows'
+        if: ${{ runner.os == 'Windows' }}
 
   test-action-ee:
     needs: test-action
     name: EE ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
     if: github.event_name != 'pull_request'
     runs-on: ${{ matrix.os }}
+    env:
+      # Skip builds that require a GDS token but have no access to one (e.g., secrets are unavailable in PR runs)
+      PASSES_GDS_TOKEN_CHECK: ${{ secrets.GDS_TOKEN != '' }}
     strategy:
       matrix:
         version: ['latest']
@@ -212,6 +215,7 @@ jobs:
           java-version: ${{ matrix.java-version }}
           components: ${{ matrix.components }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' }}
       - name: Check environment
         run: |
           echo "GRAALVM_HOME: $GRAALVM_HOME"
@@ -221,7 +225,7 @@ jobs:
           java --version | grep -e "GraalVM EE" -e "Oracle GraalVM" || exit 23
           native-image --version
           gu list
-        if: runner.os != 'Windows'
+        if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os != 'Windows' }}
       - name: Check Windows environment
         run: |
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
@@ -229,7 +233,7 @@ jobs:
           java --version
           native-image --version
           gu.cmd remove native-image
-        if: runner.os == 'Windows'
+        if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os == 'Windows' }}
 
   test-action-mandrel:
     needs: test-action
@@ -267,14 +271,14 @@ jobs:
           java --version
           java --version | grep "Temurin" || exit 23
           native-image --version
-        if: runner.os != 'Windows'
+        if: ${{ runner.os != 'Windows' }}
       - name: Check Windows environment
         run: |
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
           echo "JAVA_HOME: $env:JAVA_HOME"
           java --version
           native-image --version
-        if: runner.os == 'Windows'
+        if: ${{ runner.os == 'Windows' }}
 
   test-action-liberica:
     needs: test-action
@@ -303,7 +307,7 @@ jobs:
           java --version | fgrep -qw ${{ matrix.java-version }} || exit 23
           native-image --version
           native-image --version | fgrep -qw ${{ matrix.java-version }} || exit 24
-        if: runner.os != 'Windows'
+        if: ${{ runner.os != 'Windows' }}
       - name: Check Windows environment
         shell: pwsh
         run: |
@@ -317,7 +321,7 @@ jobs:
           if (!(native-image --version | findstr \<${{ matrix.java-version }}\>)) {
             exit 24
           }
-        if: runner.os == 'Windows'
+        if: ${{ runner.os == 'Windows' }}
 
   test-action-native-image-windows:
     name: native-image on windows-latest
@@ -466,17 +470,18 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           components: ${{ matrix.components }}
           native-image-enable-sbom: 'true'
+          cache: 'maven'
       - name: Build Maven project and verify that SBOM was generated and its contents
         run: |
           cd __tests__/sbom/main-test-app
           mvn --no-transfer-progress -Pnative package
           bash verify-sbom.sh
         shell: bash
-        if: runner.os != 'Windows'
+        if: ${{ runner.os != 'Windows' }}
       - name: Build Maven project and verify that SBOM was generated and its contents (Windows)
         run: |
           cd __tests__\sbom\main-test-app
           mvn --no-transfer-progress -Pnative package
           cmd /c verify-sbom.cmd
         shell: cmd
-        if: runner.os == 'Windows'
+        if: ${{ runner.os == 'Windows' }}

action.yml

@@ -72,6 +72,6 @@ outputs:
     description: 'A boolean value to indicate an exact match was found for the primary key'
 runs:
   using: 'node20'
-  main: 'dist/main.js'
-  post: 'dist/cleanup.js'
+  main: 'dist/main/index.js'
+  post: 'dist/cleanup/index.js'
   post-if: 'success()'

jest.config.js

@@ -1,29 +1,14 @@
-// See: https://jestjs.io/docs/configuration
-
-/** @type {import('ts-jest').JestConfigWithTsJest} **/
-export default {
+module.exports = {
   clearMocks: true,
   collectCoverage: true,
   collectCoverageFrom: ['./src/**'],
   coverageDirectory: './coverage',
   coveragePathIgnorePatterns: ['/node_modules/', '/dist/'],
   coverageReporters: ['json-summary', 'text', 'lcov'],
-  extensionsToTreatAsEsm: ['.ts'],
-  moduleFileExtensions: ['ts', 'js'],
-  preset: 'ts-jest',
-  reporters: ['default'],
-  resolver: 'ts-jest-resolver',
-  testEnvironment: 'node',
+  moduleFileExtensions: ['js', 'ts'],
   testMatch: ['**/*.test.ts'],
-  testPathIgnorePatterns: ['/dist/', '/node_modules/'],
   transform: {
-    '^.+\\.ts$': [
-      'ts-jest',
-      {
-        tsconfig: 'tsconfig.eslint.json',
-        useESM: true
-      }
-    ]
+    '^.+\\.ts$': 'ts-jest'
   },
   verbose: true
 }

package.json

@@ -2,8 +2,7 @@
   "name": "setup-graalvm",
   "author": "GraalVM Community",
   "description": "GitHub Action for GraalVM",
-  "version": "1.3.0",
-  "type": "module",
+  "version": "1.3.1",
   "private": true,
   "repository": {
     "type": "git",
@@ -27,8 +26,8 @@
     "format:check": "npx prettier --check .",
     "lint": "npx eslint .",
     "package": "npm run package:main && npm run package:cleanup",
-    "package:main": "npx rollup --config rollup.main.config.ts --configPlugin @rollup/plugin-typescript",
-    "package:cleanup": "npx rollup --config rollup.cleanup.config.ts --configPlugin @rollup/plugin-typescript",
+    "package:main": "npx ncc build src/main.ts -o dist/main",
+    "package:cleanup": "npx ncc build src/cleanup.ts -o dist/cleanup",
     "test": "npx jest",
     "all": "npm run format:write && npm run lint && npm run test && npm run package"
   },
@@ -43,25 +42,22 @@
     "@actions/io": "^1.1.3",
     "@actions/tool-cache": "^2.0.2",
     "@octokit/core": "^5.2.0",
-    "@octokit/types": "^12.6.0",
+    "@octokit/types": "^13.8.0",
     "@github/dependency-submission-toolkit": "^2.0.4",
-    "semver": "^7.6.3",
+    "semver": "^7.7.1",
     "uuid": "^11.0.5"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.6",
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-typescript": "^12.1.1",
     "@types/jest": "^29.5.14",
-    "@types/node": "^20.17.12",
+    "@types/node": "^20.17.17",
     "@types/semver": "^7.5.8",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
-    "eslint": "^9.19.0",
-    "eslint-config-prettier": "^9.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.0",
+    "@typescript-eslint/parser": "^8.24.0",
+    "@vercel/ncc": "^0.38.3",
+    "eslint": "^9.20.1",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-import-resolver-typescript": "^3.6.3",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.10.0",
@@ -70,15 +66,10 @@
     "eslint-plugin-prettier": "^5.2.3",
     "jest": "^29.7.0",
     "js-yaml": "^4.1.0",
-    "prettier": "^3.4.2",
+    "prettier": "^3.5.0",
     "prettier-eslint": "^16.3.0",
-    "rollup": "^4.34.1",
     "ts-jest": "^29.2.5",
-    "ts-jest-resolver": "^2.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3"
-  },
-  "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "*"
   }
 }

rollup.cleanup.config.ts

@@ -1,19 +0,0 @@
-// See: https://rollupjs.org/introduction/
-
-import commonjs from '@rollup/plugin-commonjs'
-import json from '@rollup/plugin-json'
-import nodeResolve from '@rollup/plugin-node-resolve'
-import typescript from '@rollup/plugin-typescript'
-
-const config = {
-  input: 'src/cleanup.ts',
-  output: {
-    esModule: true,
-    file: 'dist/cleanup.js',
-    format: 'es',
-    sourcemap: true
-  },
-  plugins: [typescript(), nodeResolve(), commonjs(), json()]
-}
-
-export default config

rollup.main.config.ts

@@ -1,19 +0,0 @@
-// See: https://rollupjs.org/introduction/
-
-import commonjs from '@rollup/plugin-commonjs'
-import json from '@rollup/plugin-json'
-import nodeResolve from '@rollup/plugin-node-resolve'
-import typescript from '@rollup/plugin-typescript'
-
-const config = {
-  input: 'src/main.ts',
-  output: {
-    esModule: true,
-    file: 'dist/main.js',
-    format: 'es',
-    sourcemap: true
-  },
-  plugins: [typescript(), nodeResolve(), commonjs(), json()]
-}
-
-export default config

src/cleanup.ts

@@ -25,10 +25,10 @@
  */
 
 import * as core from '@actions/core'
-import * as constants from './constants.js'
-import { save } from './features/cache.js'
-import { generateReports } from './features/reports.js'
-import { processSBOM } from './features/sbom.js'
+import * as constants from './constants'
+import { save } from './features/cache'
+import { generateReports } from './features/reports'
+import { processSBOM } from './features/sbom'
 
 /**
  * Check given input and run a save process for the specified package manager

src/constants.ts

@@ -1,6 +1,6 @@
 import * as otypes from '@octokit/types'
 
-export const ACTION_VERSION = '1.3.0'
+export const ACTION_VERSION = '1.3.1'
 
 export const INPUT_VERSION = 'version'
 export const INPUT_GDS_TOKEN = 'gds-token'

src/dependencies.ts

@@ -1,6 +1,6 @@
 import * as core from '@actions/core'
-import { GRAALVM_PLATFORM } from './constants.js'
-import { exec } from './utils.js'
+import { GRAALVM_PLATFORM } from './constants'
+import { exec } from './utils'
 
 const APT_GET_INSTALL_BASE = 'sudo apt-get -y --no-upgrade install'
 const COMPONENT_TO_DEPS = new Map<string, Map<string, string>>([

src/features/musl.ts

@@ -1,7 +1,7 @@
-import * as c from '../constants.js'
+import * as c from '../constants'
 import * as core from '@actions/core'
 import * as tc from '@actions/tool-cache'
-import { exec } from '../utils.js'
+import { exec } from '../utils'
 import { join } from 'path'
 
 const MUSL_NAME = 'x86_64-linux-musl-native'

src/features/reports.ts

@@ -1,4 +1,4 @@
-import * as c from '../constants.js'
+import * as c from '../constants'
 import * as core from '@actions/core'
 import * as fs from 'fs'
 import * as github from '@actions/github'
@@ -11,7 +11,7 @@ import {
   updatePRComment,
   tmpfile,
   setNativeImageOption
-} from '../utils.js'
+} from '../utils'
 
 const BUILD_OUTPUT_JSON_PATH = tmpfile('native-image-build-output.json')
 const BYTES_TO_KiB = 1024

src/features/sbom.ts

@@ -1,11 +1,11 @@
-import * as c from '../constants.js'
+import * as c from '../constants'
 import * as core from '@actions/core'
 import * as fs from 'fs'
 import * as github from '@actions/github'
 import * as glob from '@actions/glob'
 import { basename } from 'path'
 import * as semver from 'semver'
-import { setNativeImageOption } from '../utils.js'
+import { setNativeImageOption } from '../utils'
 
 const INPUT_NI_SBOM = 'native-image-enable-sbom'
 const SBOM_FILE_SUFFIX = '.sbom.json'

src/gds.ts

@@ -1,4 +1,4 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as core from '@actions/core'
 import * as fs from 'fs'
 import * as httpClient from '@actions/http-client'
@@ -8,8 +8,8 @@ import * as stream from 'stream'
 import * as util from 'util'
 import * as semver from 'semver'
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http'
-import { RetryHelper } from '@actions/tool-cache/lib/retry-helper.js'
-import { calculateSHA256 } from './utils.js'
+import { RetryHelper } from '@actions/tool-cache/lib/retry-helper'
+import { calculateSHA256 } from './utils'
 import { ok } from 'assert'
 import { v4 as uuidv4 } from 'uuid'
 

src/graalvm.ts

@@ -1,4 +1,4 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as core from '@actions/core'
 import * as semver from 'semver'
 import {
@@ -8,8 +8,8 @@ import {
   getLatestRelease,
   getMatchingTags,
   getTaggedRelease
-} from './utils.js'
-import { downloadGraalVM, downloadGraalVMEELegacy } from './gds.js'
+} from './utils'
+import { downloadGraalVM, downloadGraalVMEELegacy } from './gds'
 import { downloadTool } from '@actions/tool-cache'
 import { basename } from 'path'
 

src/gu.ts

@@ -1,8 +1,8 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as core from '@actions/core'
 import * as semver from 'semver'
-import { GRAALVM_PLATFORM } from './constants.js'
-import { exec } from './utils.js'
+import { GRAALVM_PLATFORM } from './constants'
+import { exec } from './utils'
 import { join } from 'path'
 
 const BASE_FLAGS = ['--non-interactive', 'install', '--no-progress']

src/liberica.ts

@@ -1,6 +1,6 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as semver from 'semver'
-import { downloadExtractAndCacheJDK, getTaggedRelease, getMatchingTags } from './utils.js'
+import { downloadExtractAndCacheJDK, getTaggedRelease, getMatchingTags } from './utils'
 import { downloadTool } from '@actions/tool-cache'
 import { spawnSync } from 'child_process'
 

src/main.ts

@@ -1,20 +1,20 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as core from '@actions/core'
-import * as graalvm from './graalvm.js'
+import * as graalvm from './graalvm'
 import * as semver from 'semver'
 import { isFeatureAvailable as isCacheAvailable } from '@actions/cache'
 import { basename, join } from 'path'
-import { restore } from './features/cache.js'
-import { setUpDependencies } from './dependencies.js'
-import { setUpGUComponents } from './gu.js'
-import { setUpMandrel } from './mandrel.js'
-import { setUpLiberica } from './liberica.js'
-import { checkForUpdates } from './features/check-for-updates.js'
-import { setUpNativeImageMusl } from './features/musl.js'
-import { setUpWindowsEnvironment } from './msvc.js'
-import { setUpNativeImageBuildReports } from './features/reports.js'
+import { restore } from './features/cache'
+import { setUpDependencies } from './dependencies'
+import { setUpGUComponents } from './gu'
+import { setUpMandrel } from './mandrel'
+import { setUpLiberica } from './liberica'
+import { checkForUpdates } from './features/check-for-updates'
+import { setUpNativeImageMusl } from './features/musl'
+import { setUpWindowsEnvironment } from './msvc'
+import { setUpNativeImageBuildReports } from './features/reports'
 import { exec } from '@actions/exec'
-import { setUpSBOMSupport } from './features/sbom.js'
+import { setUpSBOMSupport } from './features/sbom'
 
 async function run(): Promise<void> {
   try {

src/mandrel.ts

@@ -1,6 +1,6 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as httpClient from '@actions/http-client'
-import { downloadExtractAndCacheJDK } from './utils.js'
+import { downloadExtractAndCacheJDK } from './utils'
 import { downloadTool } from '@actions/tool-cache'
 import { basename } from 'path'
 

src/msvc.ts

@@ -1,7 +1,7 @@
 import * as core from '@actions/core'
 import { execSync } from 'child_process'
 import { existsSync } from 'fs'
-import { VERSION_DEV } from './constants.js'
+import { VERSION_DEV } from './constants'
 
 // Keep in sync with https://github.com/actions/virtual-environments
 const KNOWN_VISUAL_STUDIO_INSTALLATIONS = [

src/utils.ts

@@ -1,4 +1,4 @@
-import * as c from './constants.js'
+import * as c from './constants'
 import * as core from '@actions/core'
 import * as github from '@actions/github'
 import * as httpClient from '@actions/http-client'

tsconfig.base.json

@@ -15,6 +15,7 @@
     "noUnusedParameters": false,
     "pretty": true,
     "resolveJsonModule": true,
+    "sourceMap": true,
     "strict": true,
     "strictNullChecks": true,
     "target": "ES2022"

tsconfig.eslint.json

@@ -6,12 +6,5 @@
     "noEmit": true
   },
   "exclude": ["dist", "node_modules"],
-  "include": [
-    "__tests__",
-    "src",
-    "eslint.config.mjs",
-    "jest.config.js",
-    "rollup.cleanup.config.ts",
-    "rollup.main.config.ts"
-  ]
+  "include": ["__tests__", "src", "eslint.config.mjs", "jest.config.js"]
 }