actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2024-12-04 06:11:07 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix semver not resolving correctly

Browse source
This commit is contained in:
Gregory Mitchell 2024-11-05 10:37:49 -06:00
parent a137832311
commit 34a32f818e
No known key found for this signature in database
GPG key ID: 771A6C995A086B84
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/setup/index.js vendored
View file

@ -124639,7 +124639,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
const url = `https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${semver}-${platform}-${arch}-b${build}.tar.gz`; const url = `https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${semver}-${platform}-${arch}-b${build}.tar.gz`;
return { return {
tag_name: tag, tag_name: tag,
semver: semver, semver: semver.replace(/_/g, '.'),
build: build, build: build,
url: url url: url
}; };
@ -124648,7 +124648,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
core.startGroup('Print information about available versions'); core.startGroup('Print information about available versions');
console.timeEnd('Retrieving available versions for JBR took'); // eslint-disable-line no-console console.timeEnd('Retrieving available versions for JBR took'); // eslint-disable-line no-console
core.debug(`Available versions: [${versions.length}]`); core.debug(`Available versions: [${versions.length}]`);
core.debug(versions.map(item => item.tag_name).join(', ')); core.debug(versions.map(item => item.semver).join(', '));
core.endGroup(); core.endGroup();
} }
return versions; return versions;

7
src/distributions/jetbrains/installer.ts
View file

@ -2,9 +2,8 @@ import * as core from '@actions/core';
import * as tc from '@actions/tool-cache'; import * as tc from '@actions/tool-cache';
import fs from 'fs'; import fs from 'fs';
import path, {resolve} from 'path'; import path from 'path';
import semver from 'semver'; import semver from 'semver';
import https from 'https';
import {JavaBase} from '../base-installer'; import {JavaBase} from '../base-installer';
import {IJetBrainsRawVersion, IJetBrainsVersion} from './models'; import {IJetBrainsRawVersion, IJetBrainsVersion} from './models';
@ -156,7 +155,7 @@ export class JetBrainsDistribution extends JavaBase {
return { return {
tag_name: tag, tag_name: tag,
semver: semver, semver: semver.replace(/_/g, '.'),
build: build, build: build,
url: url url: url
} as IJetBrainsVersion; } as IJetBrainsVersion;
@ -166,7 +165,7 @@ export class JetBrainsDistribution extends JavaBase {
core.startGroup('Print information about available versions'); core.startGroup('Print information about available versions');
console.timeEnd('Retrieving available versions for JBR took'); // eslint-disable-line no-console console.timeEnd('Retrieving available versions for JBR took'); // eslint-disable-line no-console
core.debug(`Available versions: [${versions.length}]`); core.debug(`Available versions: [${versions.length}]`);
core.debug(versions.map(item => item.tag_name).join(', ')); core.debug(versions.map(item => item.semver).join(', '));
core.endGroup(); core.endGroup();
} }