Compare commits

..

3 Commits

Author SHA1 Message Date
Gregory Mitchell
4e223ceccf
Merge a137832311 into 83a06ff9d9 2024-10-19 20:42:36 +00:00
Gregory Mitchell
a137832311
Don't Replace Underscores 2024-10-19 15:42:29 -05:00
Gregory Mitchell
3419d2fd8e
Change Distribution to \jbrsdk\ 2024-10-19 15:38:12 -05:00
3 changed files with 7 additions and 6 deletions

4
dist/setup/index.js vendored
View File

@ -124638,7 +124638,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
vstring = tag.substring(tag.lastIndexOf('-') + 1); vstring = tag.substring(tag.lastIndexOf('-') + 1);
break; break;
case 1: case 1:
vstring = tag.substring(2).replace(/-/g, '').replace(/_/g, '.'); vstring = tag.substring(2).replace(/-/g, '');
break; break;
case undefined: // 0 case undefined: // 0
vstring = tag.substring(3); vstring = tag.substring(3);
@ -124650,7 +124650,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
const semver = vsplit[0]; const semver = vsplit[0];
const build = +vsplit[1]; const build = +vsplit[1];
// Construct URL // Construct URL
const url = `https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-${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,

View File

@ -173,7 +173,7 @@ steps:
``` ```
### JetBrains ### JetBrains
**NOTE:** JetBrains only provides jdk and is only available for LTS versions 11 or later. **NOTE:** JetBrains only provides jdk and is only available for LTS versions 11 or later. JCEF is not bundled with this distribution.
```yaml ```yaml
steps: steps:

View File

@ -2,8 +2,9 @@ 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 from 'path'; import path, {resolve} 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';
@ -137,7 +138,7 @@ export class JetBrainsDistribution extends JavaBase {
vstring = tag.substring(tag.lastIndexOf('-') + 1); vstring = tag.substring(tag.lastIndexOf('-') + 1);
break; break;
case 1: case 1:
vstring = tag.substring(2).replace(/-/g, '').replace(/_/g, '.'); vstring = tag.substring(2).replace(/-/g, '');
break; break;
case undefined: // 0 case undefined: // 0
vstring = tag.substring(3); vstring = tag.substring(3);
@ -151,7 +152,7 @@ export class JetBrainsDistribution extends JavaBase {
const build = +vsplit[1]; const build = +vsplit[1];
// Construct URL // Construct URL
const url = `https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-${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,