Skip to content

Commit 871f041

Browse files
authored
Merge pull request #577 from actions/remove-cdn-fallback-v1
`v1` - Remove `dotnetcli.blob.core.windows.net` storage account fallback logic and update install scripts
2 parents 71a4fd9 + 67cd79c commit 871f041

File tree

5 files changed

+219
-265
lines changed

5 files changed

+219
-265
lines changed

.github/workflows/workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
runs-on: ubuntu-22.04
201201
env:
202202
https_proxy: http://no-such-proxy:3128
203-
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net
203+
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
204204
steps:
205205
- name: Checkout
206206
uses: actions/checkout@v2

dist/index.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18168,13 +18168,7 @@ class DotnetCoreInstaller {
1816818168
}
1816918169
getReleasesJsonUrl(httpClient, versionParts) {
1817018170
return __awaiter(this, void 0, void 0, function* () {
18171-
let response;
18172-
try {
18173-
response = yield httpClient.getJson(DotNetCoreIndexUrl);
18174-
}
18175-
catch (error) {
18176-
response = yield httpClient.getJson(DotnetCoreIndexFallbackUrl);
18177-
}
18171+
const response = yield httpClient.getJson(DotNetCoreIndexUrl);
1817818172
const result = response.result || {};
1817918173
let releasesInfo = result['releases-index'];
1818018174
releasesInfo = releasesInfo.filter((info) => {
@@ -18199,7 +18193,6 @@ class DotnetCoreInstaller {
1819918193
}
1820018194
exports.DotnetCoreInstaller = DotnetCoreInstaller;
1820118195
const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
18202-
const DotnetCoreIndexFallbackUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';
1820318196

1820418197

1820518198
/***/ }),

0 commit comments

Comments
 (0)