From 32271541aee26418c288f08329e2499c04279e18 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 23 Jul 2019 11:03:29 -0400 Subject: [PATCH 1/4] Fix fallback urls (#6) --- lib/installer.js | 8 ++++---- src/installer.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/installer.js b/lib/installer.js index 19f608c..3d207a6 100644 --- a/lib/installer.js +++ b/lib/installer.js @@ -250,8 +250,8 @@ class DotnetCoreInstaller { } } }); - primaryUrlSearchString = 'dotnet-install: Primary - '; - legacyUrlSearchString = 'dotnet-install: Legacy - '; + primaryUrlSearchString = 'dotnet-install: Primary named payload URL: '; + legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: '; } else { let escapedScript = path @@ -266,8 +266,8 @@ class DotnetCoreInstaller { } } }); - primaryUrlSearchString = 'dotnet-install: Payload URL: '; - legacyUrlSearchString = 'dotnet-install: Legacy payload URL: '; + primaryUrlSearchString = 'dotnet-install: Primary named payload URL: '; + legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: '; } if (resultCode != 0) { throw `Failed to get download urls with result code ${resultCode}. ${output}`; diff --git a/src/installer.ts b/src/installer.ts index 0ae3cf9..66fc1cc 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -274,8 +274,8 @@ export class DotnetCoreInstaller { } ); - primaryUrlSearchString = 'dotnet-install: Primary - '; - legacyUrlSearchString = 'dotnet-install: Legacy - '; + primaryUrlSearchString = 'dotnet-install: Primary named payload URL: '; + legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: '; } else { let escapedScript = path .join(__dirname, '..', 'externals', 'install-dotnet.sh') @@ -295,8 +295,8 @@ export class DotnetCoreInstaller { } ); - primaryUrlSearchString = 'dotnet-install: Payload URL: '; - legacyUrlSearchString = 'dotnet-install: Legacy payload URL: '; + primaryUrlSearchString = 'dotnet-install: Primary named payload URL: '; + legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: '; } if (resultCode != 0) { From 945aa11163312b12f1446926080f4199bee0ab5c Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 23 Jul 2019 13:22:11 -0400 Subject: [PATCH 2/4] Update workflow.yml (#7) --- .github/workflows/workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a5a51b0..1618d45 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -8,6 +8,9 @@ jobs: matrix: operating-system: [ubuntu-latest, windows-latest] actions: + - name: Checkout + uses: actions/checkout@master + - name: Set Node.js 10.x uses: actions/setup-node@master with: From 0ee1d31b448471c64005f6017f829eb8e2fc7cbc Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 23 Jul 2019 15:16:35 -0400 Subject: [PATCH 3/4] Add checkout --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9834664..a03a602 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ See [action.yml](action.yml) Basic: ```yaml actions: +- uses: actions/checkout@latest - uses: actions/setup-dotnet@latest with: version: 2.2.103 // Version to use. @@ -27,6 +28,7 @@ jobs: dotnet: [ 2.2.103, 3.5.2, 4.5.1 ] name: Dotnet ${{ matrix.dotnet }} sample actions: + - uses: actions/checkout@latest - name: Setup dotnet uses: actions/setup-dotnet@latest with: From 1566687aab0174315f0dca088335d70ef969c4a8 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 23 Jul 2019 15:45:43 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a03a602..ab24e85 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ See [action.yml](action.yml) Basic: ```yaml actions: -- uses: actions/checkout@latest -- uses: actions/setup-dotnet@latest +- uses: actions/checkout@master +- uses: actions/setup-dotnet@master with: version: 2.2.103 // Version to use. - run: dotnet build @@ -28,9 +28,9 @@ jobs: dotnet: [ 2.2.103, 3.5.2, 4.5.1 ] name: Dotnet ${{ matrix.dotnet }} sample actions: - - uses: actions/checkout@latest + - uses: actions/checkout@master - name: Setup dotnet - uses: actions/setup-dotnet@latest + uses: actions/setup-dotnet@master with: version: ${{ matrix.dotnet }} - run: dotnet build