Compare commits

..

5 Commits

Author SHA1 Message Date
Aparna Jyothi
a87315f729 ubuntu-latest to ubuntu-22-04 2025-04-10 18:05:44 +05:30
Aparna Jyothi
8f6cc5c0f6 macos-latest to macos-13 2025-04-10 16:59:17 +05:30
Aparna Jyothi
4726f89bc9 macos-latest to macos-13 2025-04-10 16:55:47 +05:30
Aparna Jyothi
600e3d9953 npm audit fix 2025-04-09 14:11:43 +05:30
Aparna Jyothi
d0728cce06 actions-cache upgrade to 4.0.3 on node 16 2025-04-08 18:46:30 +05:30
5 changed files with 13 additions and 44 deletions

View File

@@ -132,11 +132,6 @@ jobs:
distribution: 'adopt' distribution: 'adopt'
java-version: '11' java-version: '11'
cache: sbt cache: sbt
- name: Setup SBT
if: matrix.os == 'macos-13'
run: |
echo ""Installing SBT...""
brew install sbt
- name: Create files to cache - name: Create files to cache
run: sbt update run: sbt update

View File

@@ -20,7 +20,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-13, windows-2022, ubuntu-22.04] os: [macos-13, windows-latest, ubuntu-latest]
distribution: [ distribution: [
'temurin', 'temurin',
'adopt', 'adopt',
@@ -37,10 +37,10 @@ jobs:
- distribution: microsoft - distribution: microsoft
version: 8 version: 8
- distribution: dragonwell - distribution: dragonwell
os: macos-13 os: macos-latest
include: include:
- distribution: oracle - distribution: oracle
os: macos-13 os: macos-latest
version: 17 version: 17
- distribution: oracle - distribution: oracle
os: windows-latest os: windows-latest
@@ -69,7 +69,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-13, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
distribution: ['temurin', 'zulu', 'liberica'] distribution: ['temurin', 'zulu', 'liberica']
version: version:
- '11.0' - '11.0'
@@ -171,7 +171,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-13, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
version: ['17-ea', '15.0.0-ea.14'] version: ['17-ea', '15.0.0-ea.14']
steps: steps:
- name: Checkout - name: Checkout
@@ -215,7 +215,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-13, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
distribution: ['temurin', 'zulu', 'liberica', 'semeru'] distribution: ['temurin', 'zulu', 'liberica', 'semeru']
java-package: ['jre'] java-package: ['jre']
version: ['17.0'] version: ['17.0']
@@ -263,7 +263,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
# x86 is not supported on macOS # x86 is not supported on macOS
os: [windows-latest, ubuntu-22.04] os: [windows-latest, ubuntu-latest]
distribution: ['liberica', 'zulu', 'corretto'] distribution: ['liberica', 'zulu', 'corretto']
version: ['11'] version: ['11']
steps: steps:

View File

@@ -1,20 +0,0 @@
name: 'Publish Immutable Action Version'
on:
release:
types: [published]
jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
packages: write
steps:
- name: Checking out
uses: actions/checkout@v4
- name: Publish
id: publish
uses: actions/publish-immutable-action@v0.0.4

7
dist/setup/index.js vendored
View File

@@ -130914,10 +130914,9 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
} }
// Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits). // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
// Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools. // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
const jdkVersionNums = jdkVersion if (jdkVersion.split('.').length > 3) {
.replace('+', '.') jdkVersion = util_1.convertVersionToSemver(jdkVersion);
.split('.'); }
jdkVersion = util_1.convertVersionToSemver(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
for (const edition in archMap) { for (const edition in archMap) {
eligibleVersions.push({ eligibleVersions.push({
os: platform, os: platform,

View File

@@ -149,14 +149,9 @@ export class DragonwellDistribution extends JavaBase {
// Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits). // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
// Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools. // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
const jdkVersionNums: string[] = jdkVersion if (jdkVersion.split('.').length > 3) {
.replace('+', '.') jdkVersion = convertVersionToSemver(jdkVersion);
.split('.'); }
jdkVersion = convertVersionToSemver(
`${jdkVersionNums.slice(0, 3).join('.')}.${
jdkVersionNums[jdkVersionNums.length - 1]
}`
);
for (const edition in archMap) { for (const edition in archMap) {
eligibleVersions.push({ eligibleVersions.push({