Compare commits

...

2 Commits

Author SHA1 Message Date
8bcd8d8b49 linter fixes 2025-01-02 00:13:37 +00:00
0b32034241 Remove CDN fallback logic (v2) 2025-01-02 00:11:57 +00:00
5 changed files with 2095 additions and 2108 deletions

View File

@ -5,11 +5,7 @@ import path = require('path');
const fakeSourcesDirForTesting = path.join( const fakeSourcesDirForTesting = path.join(
__dirname, __dirname,
'runner', 'runner',
path.join( path.join(Math.random().toString(36).substring(7)),
Math.random()
.toString(36)
.substring(7)
),
's' 's'
); );

1
dist/index.js vendored
View File

@ -410,7 +410,6 @@ class DotnetCoreInstaller {
} }
exports.DotnetCoreInstaller = DotnetCoreInstaller; exports.DotnetCoreInstaller = DotnetCoreInstaller;
const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json'; const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
const DotnetCoreIndexFallbackUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';
/***/ }), /***/ }),

View File

@ -262,12 +262,8 @@ export class DotnetCoreInstaller {
httpClient: hc.HttpClient, httpClient: hc.HttpClient,
versionParts: string[] versionParts: string[]
): Promise<string> { ): Promise<string> {
let response; const response = await httpClient.getJson<any>(DotNetCoreIndexUrl);
try {
response = await httpClient.getJson<any>(DotNetCoreIndexUrl);
} catch (error) {
response = await httpClient.getJson<any>(DotnetCoreIndexFallbackUrl);
}
const result = response.result || {}; const result = response.result || {};
let releasesInfo: any[] = result['releases-index']; let releasesInfo: any[] = result['releases-index'];
@ -307,6 +303,3 @@ export class DotnetCoreInstaller {
const DotNetCoreIndexUrl: string = const DotNetCoreIndexUrl: string =
'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json'; 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
const DotnetCoreIndexFallbackUrl: string =
'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';

View File

@ -38,9 +38,8 @@ export async function run() {
} }
if (versions.length) { if (versions.length) {
const includePrerelease: boolean = core.getBooleanInput( const includePrerelease: boolean =
'include-prerelease' core.getBooleanInput('include-prerelease');
);
let dotnetInstaller!: installer.DotnetCoreInstaller; let dotnetInstaller!: installer.DotnetCoreInstaller;
for (const version of new Set<string>(versions)) { for (const version of new Set<string>(versions)) {
dotnetInstaller = new installer.DotnetCoreInstaller( dotnetInstaller = new installer.DotnetCoreInstaller(