Skip to content

Commit c7a7d21

Browse files
committed
Merge remote-tracking branch 'origin/master' into Localization
2 parents 6fb8974 + ef748b4 commit c7a7d21

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

azure-pipelines.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
jobs:
2-
- job: 'Ubuntu_1804'
3-
pool:
4-
vmImage: 'Ubuntu-18.04'
52

3+
- job: 'Ubuntu_2204'
4+
pool:
5+
vmImage: 'ubuntu-22.04'
66
steps:
77
- template: azure-pipelines-steps.yml
88

9-
- job: 'VS2017_Win2016'
9+
- job: 'MacOS_12'
1010
pool:
11-
vmImage: 'vs2017-win2016'
11+
vmImage: 'macOS-12'
12+
steps:
13+
- template: azure-pipelines-steps.yml
1214

15+
- job: 'Windows_2022'
16+
pool:
17+
vmImage: 'windows-2022'
1318
steps:
1419
- template: azure-pipelines-steps.yml
1520

@@ -33,10 +38,3 @@ jobs:
3338
artifactName: npm
3439
displayName: 'Publish npm artifact'
3540
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
36-
37-
- job: 'MacOS_1014'
38-
pool:
39-
vmImage: 'macOS-10.14'
40-
41-
steps:
42-
- template: azure-pipelines-steps.yml

test/tests/toolTests.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ describe('Tool Tests', function () {
5454

5555
return new Promise<void>(async (resolve, reject) => {
5656
try {
57-
58-
let downPath: string = await toolLib.downloadTool("https://httpbingo.org/redirect-to?url=" + encodeURI('https://httpbin.org/bytes/100') + "&status_code=302");
57+
let downPath: string = await toolLib.downloadTool("https://httpbingo.org/redirect-to?url=" + encodeURI('https://httpbingo.org/bytes/100') + "&status_code=302");
5958
toolLib.debug('downloaded path: ' + downPath);
6059

6160
assert(tl.exist(downPath), 'downloaded file exists');

0 commit comments

Comments
 (0)