Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
version: 2

multi-ecosystem-groups:
all:
schedule:
interval: 'monthly'

updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'monthly'
groups:
github-actions-updates:
patterns:
- '*'
patterns: ['*']
multi-ecosystem-group: 'all'

- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'monthly'
groups:
npm-updates:
patterns:
- '*'
patterns: ['*']
multi-ecosystem-group: 'all'
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
PASSES_GDS_TOKEN_CHECK: ${{ !matrix.set-gds-token || secrets.GDS_TOKEN != '' }}
strategy:
matrix:
java-version: ['25', '21', '17', '20', 'dev']
java-version: ['25', '21', '17', 'dev']
distribution: ['graalvm', 'graalvm-community']
os: [
ubuntu-latest, # Linux on Intel
Expand Down Expand Up @@ -77,6 +77,9 @@ jobs:
- java-version: '21.0.0' # test for GA version (see #63)
distribution: 'graalvm'
os: ubuntu-latest
- java-version: '20' # test for upgrade notice
distribution: 'graalvm'
os: ubuntu-latest
- java-version: '17'
distribution: 'graalvm'
os: ubuntu-latest
Expand Down Expand Up @@ -124,12 +127,10 @@ jobs:
strategy:
matrix:
version: ['latest', 'dev']
java-version: ['17', '20']
java-version: ['17']
components: ['native-image']
os: [macos-latest, windows-latest, ubuntu-latest]
exclude:
- version: 'latest'
java-version: '20'
- version: 'dev'
java-version: '19'
include:
Expand Down
18 changes: 18 additions & 0 deletions dist/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 3 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/graalvm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ export async function setUpGraalVMJDK(javaVersionOrDev: string, gdsToken: string
)
return setUpGraalVMJDK('17.0.12', gdsToken)
}
if (c.IS_MACOS && c.JDK_ARCH === 'x64') {
if (javaVersionOrDev === '25') {
core.warning('This build uses Oracle GraalVM for JDK 25.0.1, the last available JDK 25 build for macOS Intel.')
return setUpGraalVMJDK('25.0.1', gdsToken)
} else if (javaVersionOrDev === '21') {
core.warning('This build uses Oracle GraalVM for JDK 21.0.9, the last available JDK 21 build for macOS Intel.')
return setUpGraalVMJDK('21.0.9', gdsToken)
} else if (javaVersionOrDev === '17') {
core.warning('This build uses Oracle GraalVM for JDK 17.0.17, the last available JDK 17 build for macOS Intel.')
return setUpGraalVMJDK('17.0.17', gdsToken)
}
}
if (isTokenProvided) {
// Download from GDS
const downloader = async () => downloadGraalVM(gdsToken, javaVersion)
Expand Down Expand Up @@ -109,6 +121,10 @@ export async function setUpGraalVMJDKCE(javaVersionOrDev: string): Promise<strin
if (javaVersionOrDev === c.VERSION_DEV) {
return setUpGraalVMJDKDevBuild()
}
if (c.IS_MACOS && c.JDK_ARCH === 'x64' && javaVersionOrDev === '25') {
core.warning('This build uses GraalVM CE for JDK 25.0.1, the last available JDK 25 build for macOS Intel.')
return setUpGraalVMJDKCE('25.0.1')
}
let javaVersion = javaVersionOrDev
if (!javaVersion.includes('.')) {
javaVersion = await findLatestGraalVMJDKCEJavaVersion(javaVersion)
Expand Down