Merge 53d9f2a017 into 83a06ff9d9

dist/setup/index.js

@@ -124638,7 +124638,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                         vstring = tag.substring(tag.lastIndexOf('-') + 1);
                         break;
                     case 1:
-                        vstring = tag.substring(2).replace(/-/g, '');
+                        vstring = tag.substring(2).replace(/-/g, '').replace(/_/g, '.');
                         break;
                     case undefined: // 0
                         vstring = tag.substring(3);
@@ -124650,7 +124650,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                 const semver = vsplit[0];
                 const build = +vsplit[1];
                 // Construct URL
-                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_jcef-${semver}-${platform}-${arch}-b${build}.tar.gz`;
                 return {
                     tag_name: tag,
                     semver: semver,

docs/advanced-usage.md

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

src/distributions/jetbrains/installer.ts

@@ -2,9 +2,8 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 
 import fs from 'fs';
-import path, {resolve} from 'path';
+import path from 'path';
 import semver from 'semver';
-import https from 'https';
 
 import {JavaBase} from '../base-installer';
 import {IJetBrainsRawVersion, IJetBrainsVersion} from './models';
@@ -138,7 +137,7 @@ export class JetBrainsDistribution extends JavaBase {
           vstring = tag.substring(tag.lastIndexOf('-') + 1);
           break;
         case 1:
-          vstring = tag.substring(2).replace(/-/g, '');
+          vstring = tag.substring(2).replace(/-/g, '').replace(/_/g, '.');
           break;
         case undefined: // 0
           vstring = tag.substring(3);
@@ -152,7 +151,7 @@ export class JetBrainsDistribution extends JavaBase {
       const build = +vsplit[1];
 
       // Construct URL
-      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_jcef-${semver}-${platform}-${arch}-b${build}.tar.gz`;
 
       return {
         tag_name: tag,