Skip to content

Commit 83c0c1a

Browse files
zaataylorBen Wellsaparnajyothi-yHarithaVattikutidependabot[bot]
authored
v4 - Remove azureedge.net fallback logic and update install scripts (#572)
* Remove logic for azureedge.net fallback in preparation for install script changes * remove extra spacing * Update README.md (#587) * upgrade cache from 3.2.4 to 4.0.0 (#586) * upgrade cache to 4.0.0 * license update * failure fix * e2e failure fix * Configure Dependabot settings (#585) * Create dependabot.yml * update latest install scripts * Bump actions/publish-immutable-action from 0.0.3 to 0.0.4 (#590) Bumps [actions/publish-immutable-action](https://github.com/actions/publish-immutable-action) from 0.0.3 to 0.0.4. - [Release notes](https://github.com/actions/publish-immutable-action/releases) - [Commits](actions/publish-immutable-action@0.0.3...v0.0.4) --- updated-dependencies: - dependency-name: actions/publish-immutable-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @actions/http-client from 2.2.1 to 2.2.3 (#592) * Bump @actions/http-client from 2.2.1 to 2.2.3 Bumps [@actions/http-client](https://github.com/actions/toolkit/tree/HEAD/packages/http-client) from 2.2.1 to 2.2.3. - [Changelog](https://github.com/actions/toolkit/blob/main/packages/http-client/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/http-client) --- updated-dependencies: - dependency-name: "@actions/http-client" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix for the check failures --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aparna Jyothi <[email protected]> * Bump undici from 5.28.4 to 5.28.5 (#596) * Bump undici from 5.28.4 to 5.28.5 Bumps [undici](https://github.com/nodejs/undici) from 5.28.4 to 5.28.5. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.4...v5.28.5) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * fix for the check failures * fix for licensed check failure --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aparna Jyothi <[email protected]> * Remove old URLs from E2E tests workflow --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Ben Wells <[email protected]> Co-authored-by: aparnajyothi-y <[email protected]> Co-authored-by: HarithaVattikuti <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aparna Jyothi <[email protected]>
1 parent 3951f0d commit 83c0c1a

File tree

3 files changed

+6
-22
lines changed

3 files changed

+6
-22
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ jobs:
719719
runs-on: ubuntu-22.04
720720
env:
721721
https_proxy: http://no-such-proxy:3128
722-
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net,builds.dotnet.microsoft.com,ci.dot.net
722+
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
723723
steps:
724724
- name: Checkout
725725
uses: actions/checkout@v4
@@ -741,7 +741,7 @@ jobs:
741741
runs-on: ubuntu-latest
742742
env:
743743
https_proxy: http://no-such-proxy:3128
744-
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net,builds.dotnet.microsoft.com,ci.dot.net
744+
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
745745
steps:
746746
- name: Checkout
747747
uses: actions/checkout@v4

dist/setup/index.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102230,13 +102230,7 @@ class DotnetVersionResolver {
102230102230
allowRetries: true,
102231102231
maxRetries: 3
102232102232
});
102233-
let response;
102234-
try {
102235-
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
102236-
}
102237-
catch (error) {
102238-
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexFallbackUrl);
102239-
}
102233+
const response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
102240102234
const result = response.result || {};
102241102235
const releasesInfo = result['releases-index'];
102242102236
const releaseInfo = releasesInfo.find(info => {
@@ -102252,7 +102246,6 @@ class DotnetVersionResolver {
102252102246
}
102253102247
exports.DotnetVersionResolver = DotnetVersionResolver;
102254102248
DotnetVersionResolver.DotnetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
102255-
DotnetVersionResolver.DotnetCoreIndexFallbackUrl = 'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
102256102249
class DotnetInstallScript {
102257102250
constructor() {
102258102251
this.scriptName = utils_1.IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';

src/installer.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,9 @@ export class DotnetVersionResolver {
102102
maxRetries: 3
103103
});
104104

105-
let response;
106-
try {
107-
response = await httpClient.getJson<any>(
108-
DotnetVersionResolver.DotnetCoreIndexUrl
109-
);
110-
} catch (error) {
111-
response = await httpClient.getJson<any>(
112-
DotnetVersionResolver.DotnetCoreIndexFallbackUrl
113-
);
114-
}
105+
const response = await httpClient.getJson<any>(
106+
DotnetVersionResolver.DotnetCoreIndexUrl
107+
);
115108

116109
const result = response.result || {};
117110
const releasesInfo: any[] = result['releases-index'];
@@ -132,8 +125,6 @@ export class DotnetVersionResolver {
132125

133126
static DotnetCoreIndexUrl =
134127
'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
135-
static DotnetCoreIndexFallbackUrl =
136-
'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
137128
}
138129

139130
export class DotnetInstallScript {

0 commit comments

Comments
 (0)