From 1a966be0b4b738c496b9b7acd19588a93256630f Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 11:20:32 -0700 Subject: [PATCH 1/6] Updating path for winget manifests --- src/main.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index 01ec4e3..280abab 100644 --- a/src/main.ts +++ b/src/main.ts @@ -188,7 +188,8 @@ async function run(): Promise { ); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id.replace( + const manifestFilePath = `manifests/${id.charAt(0).toLowerCase()} + /${id.replace( '.', '/' )}/${version}.yaml`; From 31a9fd660770a347c2b585ade9d2dfaa8cff0300 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 11:24:43 -0700 Subject: [PATCH 2/6] Updating test workflow --- .github/workflows/test.yml | 34 +++++++++++++++++++++++++++++----- dist/index.js | 3 ++- src/main.ts | 5 +---- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 781af7d..a134e75 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,13 +5,37 @@ on: # rebuild any PRs and main branch changes branches: - main - 'releases/*' + - ldennington/update-publish-path jobs: - build: # make sure build/ci work properly + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: | - npm install - - run: | - npm run all + - name: Update winget repository + uses: ./ + with: + id: Microsoft.GitCredentialManagerCore + version: 2.0.194.40577 + token: ${{ secrets.WINGET_TOKEN }} + repo: ldennington/winget-pkgs + manifestText: | + PackageIdentifier: Microsoft.GitCredentialManagerCore + PackageVersion: 2.0.194.40577 + PackageName: Git Credential Manager Core + Publisher: Microsoft Corporation + Moniker: git-credential-manager-core + PackageUrl: https://aka.ms/gcmcore + License: Copyright (C) Microsoft Corporation + ShortDescription: Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. + Installers: + - Architecture: x64 + InstallerUrl: https://github.com/microsoft/Git-Credential-Manager-Core/releases/download/v2.0.194-beta/gcmcore-win-x86-2.0.194.40577.exe + InstallerType: inno + InstallerSha256: 26D3662F66E6AEC76C3BF155028D22D30ED8D1F1AFFA7C676F8DB0426939E8AD + PackageLocale: en-US + ManifestType: singleton + ManifestVersion: 1.0.0 + alwaysUsePullRequest: true + releaseRepo: 'microsoft/Git-Credential-Manager-Core' + releaseTag: 'v2.0.194-beta' diff --git a/dist/index.js b/dist/index.js index 9a71228..8d1cd09 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8360,7 +8360,8 @@ function run() { manifestText = manifestText.replace('{{version.major_minor}}', version.toString(2)); manifestText = manifestText.replace('{{version.major_minor_patch}}', version.toString(3)); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id.replace('.', '/')}/${version}.yaml`; + const manifestFilePath = `manifests/${id.charAt(0).toLowerCase()} + /${id.replace('.', '/')}/${version}.yaml`; core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); core.debug(manifestText); diff --git a/src/main.ts b/src/main.ts index 280abab..515d695 100644 --- a/src/main.ts +++ b/src/main.ts @@ -189,10 +189,7 @@ async function run(): Promise { core.debug('computing manifest file path...'); const manifestFilePath = `manifests/${id.charAt(0).toLowerCase()} - /${id.replace( - '.', - '/' - )}/${version}.yaml`; + /${id.replace('.', '/')}/${version}.yaml`; core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); From 4dfd0db0d48ba864e1f8dfa17a11e11cb6c3e29a Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 11:51:28 -0700 Subject: [PATCH 3/6] Removing space --- src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index 515d695..ce779bf 100644 --- a/src/main.ts +++ b/src/main.ts @@ -188,7 +188,7 @@ async function run(): Promise { ); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id.charAt(0).toLowerCase()} + const manifestFilePath = `manifests/${id.charAt(0).toLowerCase().trim()} /${id.replace('.', '/')}/${version}.yaml`; core.debug(`manifest file path is: ${manifestFilePath}`); From 09c0e4749f328c001c008124e36f9d6abbe4245b Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 11:53:27 -0700 Subject: [PATCH 4/6] Trying again... --- dist/index.js | 2 +- src/main.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8d1cd09..8a485e6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8360,7 +8360,7 @@ function run() { manifestText = manifestText.replace('{{version.major_minor}}', version.toString(2)); manifestText = manifestText.replace('{{version.major_minor_patch}}', version.toString(3)); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id.charAt(0).toLowerCase()} + const manifestFilePath = `manifests/${id.charAt(0).toLowerCase().trim()} /${id.replace('.', '/')}/${version}.yaml`; core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); diff --git a/src/main.ts b/src/main.ts index ce779bf..658fd8c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -188,8 +188,9 @@ async function run(): Promise { ); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id.charAt(0).toLowerCase().trim()} - /${id.replace('.', '/')}/${version}.yaml`; + const manifestFilePath = `manifests/${id + .charAt(0) + .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`; core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); From 1d777d14a22a72b3eae3e8fd294101b6e789efba Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 11:59:13 -0700 Subject: [PATCH 5/6] And again --- dist/index.js | 5 +++-- src/main.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8a485e6..844434a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8360,8 +8360,9 @@ function run() { manifestText = manifestText.replace('{{version.major_minor}}', version.toString(2)); manifestText = manifestText.replace('{{version.major_minor_patch}}', version.toString(3)); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id.charAt(0).toLowerCase().trim()} - /${id.replace('.', '/')}/${version}.yaml`; + const manifestFilePath = `manifests/${id + .charAt(0) + .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`; core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); core.debug(manifestText); diff --git a/src/main.ts b/src/main.ts index 658fd8c..05569f2 100644 --- a/src/main.ts +++ b/src/main.ts @@ -188,9 +188,9 @@ async function run(): Promise { ); core.debug('computing manifest file path...'); - const manifestFilePath = `manifests/${id + let manifestFilePath = `manifests/${id .charAt(0) - .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`; + .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`.trim(); core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); From 2234f7c4bbea6bff638caa1a77db215aa98cd11b Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 12:08:10 -0700 Subject: [PATCH 6/6] Removing test updates --- .github/workflows/test.yml | 34 +++++----------------------------- dist/index.js | 2 +- src/main.ts | 2 +- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a134e75..781af7d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,37 +5,13 @@ on: # rebuild any PRs and main branch changes branches: - main - 'releases/*' - - ldennington/update-publish-path jobs: - test: + build: # make sure build/ci work properly runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Update winget repository - uses: ./ - with: - id: Microsoft.GitCredentialManagerCore - version: 2.0.194.40577 - token: ${{ secrets.WINGET_TOKEN }} - repo: ldennington/winget-pkgs - manifestText: | - PackageIdentifier: Microsoft.GitCredentialManagerCore - PackageVersion: 2.0.194.40577 - PackageName: Git Credential Manager Core - Publisher: Microsoft Corporation - Moniker: git-credential-manager-core - PackageUrl: https://aka.ms/gcmcore - License: Copyright (C) Microsoft Corporation - ShortDescription: Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. - Installers: - - Architecture: x64 - InstallerUrl: https://github.com/microsoft/Git-Credential-Manager-Core/releases/download/v2.0.194-beta/gcmcore-win-x86-2.0.194.40577.exe - InstallerType: inno - InstallerSha256: 26D3662F66E6AEC76C3BF155028D22D30ED8D1F1AFFA7C676F8DB0426939E8AD - PackageLocale: en-US - ManifestType: singleton - ManifestVersion: 1.0.0 - alwaysUsePullRequest: true - releaseRepo: 'microsoft/Git-Credential-Manager-Core' - releaseTag: 'v2.0.194-beta' + - run: | + npm install + - run: | + npm run all diff --git a/dist/index.js b/dist/index.js index 844434a..92c74b0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8362,7 +8362,7 @@ function run() { core.debug('computing manifest file path...'); const manifestFilePath = `manifests/${id .charAt(0) - .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`; + .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`.trim(); core.debug(`manifest file path is: ${manifestFilePath}`); core.debug(`final manifest is:`); core.debug(manifestText); diff --git a/src/main.ts b/src/main.ts index 05569f2..9c237da 100644 --- a/src/main.ts +++ b/src/main.ts @@ -188,7 +188,7 @@ async function run(): Promise { ); core.debug('computing manifest file path...'); - let manifestFilePath = `manifests/${id + const manifestFilePath = `manifests/${id .charAt(0) .toLowerCase()}/${id.replace('.', '/')}/${version}.yaml`.trim(); core.debug(`manifest file path is: ${manifestFilePath}`);