diff --git a/README.md b/README.md index 5001ee7..9dfb7bf 100644 --- a/README.md +++ b/README.md @@ -41,46 +41,31 @@ jobs: - run: dotnet build ``` -Authentication to GPR: +Authentication for nuget feeds: ```yaml steps: - uses: actions/checkout@master +# Authenticates packages to push to GPR - uses: actions/setup-dotnet@v1 with: dotnet-version: '2.2.103' # SDK Version to use. - source-url: https://nuget.pkg.github.com + source-url: https://nuget.pkg.github.com//index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: dotnet build - name: Create the package run: dotnet pack --configuration Release - env: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - name: Publish the package + - name: Publish the package to GPR run: dotnet nuget push /bin/Release/*.nupkg - env: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true -``` -Authentication to Azure Artifacts: -```yaml -steps: -- uses: actions/checkout@master +# Authticates packages to push to Azure Artifacts - uses: actions/setup-dotnet@v1 with: - dotnet-version: '2.2.103' # SDK Version to use. source-url: https://pkgs.dev.azure.com//_packaging//nuget/v3/index.json env: NUGET_AUTH_TOKEN: ${{secrets.AZURE_DEVOPS_PAT}} # Note, create a secret with this name in Settings -- run: dotnet build -- name: Create the package - run: dotnet pack --configuration Release - env: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - name: Publish the package +- name: Publish the package to Azure Artifacts run: dotnet nuget push /bin/Release/*.nupkg - env: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true ``` # License diff --git a/lib/authutil.js b/lib/authutil.js index 6e229e0..a655608 100644 --- a/lib/authutil.js +++ b/lib/authutil.js @@ -28,9 +28,6 @@ function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) { if (!owner) { owner = github.context.repo.owner; } - if (feedUrl.indexOf('nuget.pkg.github.com') > -1) { - sourceUrl = 'https://nuget.pkg.github.com/' + owner + '/index.json'; - } if (!process.env.NUGET_AUTH_TOKEN || process.env.NUGET_AUTH_TOKEN == '') { throw new Error('The NUGET_AUTH_TOKEN environment variable was not provided. In this step, add the following: \r\nenv:\r\n NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}'); } diff --git a/package-lock.json b/package-lock.json index 7edf016..ba41b6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1297,9 +1297,9 @@ } }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, "optional": true }, @@ -2522,9 +2522,9 @@ "dev": true }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", + "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -4766,9 +4766,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -5355,13 +5355,13 @@ "dev": true }, "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.0.tgz", + "integrity": "sha512-PC/ee458NEMITe1OufAjal65i6lB58R1HWMRcxwvdz1UopW0DYqlRL3xdu3IcTvTXsB02CRHykidkTRL+A3hQA==", "dev": true, "optional": true, "requires": { - "commander": "~2.20.0", + "commander": "~2.20.3", "source-map": "~0.6.1" } }, @@ -5371,38 +5371,15 @@ "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "universal-user-agent": { diff --git a/src/authutil.ts b/src/authutil.ts index b36f21f..5666bff 100644 --- a/src/authutil.ts +++ b/src/authutil.ts @@ -38,9 +38,6 @@ function writeFeedToFile( if (!owner) { owner = github.context.repo.owner; } - if (feedUrl.indexOf('nuget.pkg.github.com') > -1) { - sourceUrl = 'https://nuget.pkg.github.com/' + owner + '/index.json'; - } if (!process.env.NUGET_AUTH_TOKEN || process.env.NUGET_AUTH_TOKEN == '') { throw new Error( diff --git a/src/installer.ts b/src/installer.ts index a592286..f975a22 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -10,7 +10,6 @@ import {chmodSync} from 'fs'; import * as os from 'os'; import * as path from 'path'; import * as semver from 'semver'; -import * as util from 'util'; const IS_WINDOWS = process.platform === 'win32';