Skip to content

Commit 8e6bd29

Browse files
authored
Merge pull request #576 from actions/remove-cdn-fallback-v2
`v2` - Remove `dotnetcli.blob.core.windows.net` storage account fallback logic and update install scripts
2 parents aab9aab + 603ff3a commit 8e6bd29

File tree

5 files changed

+219
-265
lines changed

5 files changed

+219
-265
lines changed

.github/workflows/workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
runs-on: ubuntu-22.04
228228
env:
229229
https_proxy: http://no-such-proxy:3128
230-
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net
230+
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
231231
steps:
232232
- name: Checkout
233233
uses: actions/checkout@v3

dist/index.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,7 @@ class DotnetCoreInstaller {
379379
}
380380
getReleasesJsonUrl(httpClient, versionParts) {
381381
return __awaiter(this, void 0, void 0, function* () {
382-
let response;
383-
try {
384-
response = yield httpClient.getJson(DotNetCoreIndexUrl);
385-
}
386-
catch (error) {
387-
response = yield httpClient.getJson(DotnetCoreIndexFallbackUrl);
388-
}
382+
const response = yield httpClient.getJson(DotNetCoreIndexUrl);
389383
const result = response.result || {};
390384
let releasesInfo = result['releases-index'];
391385
releasesInfo = releasesInfo.filter((info) => {
@@ -410,7 +404,6 @@ class DotnetCoreInstaller {
410404
}
411405
exports.DotnetCoreInstaller = DotnetCoreInstaller;
412406
const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
413-
const DotnetCoreIndexFallbackUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';
414407

415408

416409
/***/ }),

0 commit comments

Comments
 (0)