From f521f4c5e74b62add3d7fb3aaedf28a37e2720bb Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 11:10:07 -0700 Subject: [PATCH 01/14] Updating gcm winget-release to use latest task version and manifest fields --- .github/workflows/release-winget.yaml | 31 +++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 552f62970..8b69e85e6 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -7,26 +7,29 @@ jobs: release: runs-on: ubuntu-latest steps: - - name: Update winget repository - uses: mjcheetham/update-winget@v1.0 + - id: update winget + name: Update winget repository + uses: mjcheetham/update-winget@v1.1 with: - token: ${{ secrets.WINGET_TOKEN }} - repo: microsoft/winget-pkgs id: Microsoft.GitCredentialManagerCore + token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe manifestText: | - Id: {{id}} - Version: {{version}} - Name: Git Credential Manager Core + PackageIdentifier: {{id}} + PackageVersion: {{version}} + PackageName: Git Credential Manager Core Publisher: Microsoft Corporation - AppMoniker: git-credential-manager-core - Homepage: https://aka.ms/gcmcore + Moniker: git-credential-manager-core + PackageUrl: https://aka.ms/gcmcore Tags: "gcm, gcmcore, git, credential" License: Copyright (C) Microsoft Corporation - Description: Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. + ShortDescription: Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. Installers: - - Arch: x86 - Url: {{url}} - InstallerType: Inno - Sha256: {{sha256}} + - Arch: x86 + Url: {{url}} + InstallerType: Inno + Sha256: {{sha256}} + PackageLocale: en-US + ManifestType: singleton + ManifestVersion: 1.0.0 alwaysUsePullRequest: true From d0b6cb23df173abcada2c3d128fc75add7aa5860 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:07:58 -0700 Subject: [PATCH 02/14] Updates for testing --- .github/workflows/release-winget.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 8b69e85e6..48e3191cb 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -9,11 +9,12 @@ jobs: steps: - id: update winget name: Update winget repository - uses: mjcheetham/update-winget@v1.1 + uses: mjcheetham/update-winget@v1.2 with: id: Microsoft.GitCredentialManagerCore token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe + repo: ldennington/winget-playground manifestText: | PackageIdentifier: {{id}} PackageVersion: {{version}} @@ -33,3 +34,5 @@ jobs: ManifestType: singleton ManifestVersion: 1.0.0 alwaysUsePullRequest: true + releaseRepo: 'microsoft/Git-Credential-Manager-Core' + releaseTag: 'v2.0.194-beta' From d87c0aac0c503ebc1a0fe69befa5648842396443 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:16:20 -0700 Subject: [PATCH 03/14] Updating workflow for testing --- .github/workflows/release-winget.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 48e3191cb..ce89d06e5 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -2,6 +2,9 @@ name: "release-winget" on: release: types: [released] + push: + branches: + - ldennington/update-winget-deployments jobs: release: From c19fec9128ae2293bb1be78b79a71a82e1e07d12 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:16:41 -0700 Subject: [PATCH 04/14] Test task version correction --- .github/workflows/release-winget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index ce89d06e5..2b17b7ac7 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -12,7 +12,7 @@ jobs: steps: - id: update winget name: Update winget repository - uses: mjcheetham/update-winget@v1.2 + uses: mjcheetham/update-winget@v1.1 with: id: Microsoft.GitCredentialManagerCore token: ${{ secrets.WINGET_TOKEN }} From 2b7eb89638c71d1ad5a9f3fb399513d008195f58 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:18:24 -0700 Subject: [PATCH 05/14] Fixing id --- .github/workflows/release-winget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 2b17b7ac7..445af9bda 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -10,7 +10,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - id: update winget + - id: update-winget name: Update winget repository uses: mjcheetham/update-winget@v1.1 with: From 561093c5f818b2fb22c96e53aa32e8f7dd79d67d Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:30:14 -0700 Subject: [PATCH 06/14] Specifying master branch --- .github/workflows/release-winget.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 445af9bda..ee49f0345 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -12,6 +12,7 @@ jobs: steps: - id: update-winget name: Update winget repository + branch: master uses: mjcheetham/update-winget@v1.1 with: id: Microsoft.GitCredentialManagerCore From 61ce3d87a7ab38a75ac428f96636ded80c142462 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:32:04 -0700 Subject: [PATCH 07/14] Putting branch in the right spot --- .github/workflows/release-winget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index ee49f0345..60ea235d5 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -12,13 +12,13 @@ jobs: steps: - id: update-winget name: Update winget repository - branch: master uses: mjcheetham/update-winget@v1.1 with: id: Microsoft.GitCredentialManagerCore token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe repo: ldennington/winget-playground + branch: master manifestText: | PackageIdentifier: {{id}} PackageVersion: {{version}} From 0e80bef131c51b12f77e319fbd57278a3c6f16cd Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:34:29 -0700 Subject: [PATCH 08/14] Main --- .github/workflows/release-winget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 60ea235d5..c0bc641ec 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -18,7 +18,7 @@ jobs: token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe repo: ldennington/winget-playground - branch: master + branch: main manifestText: | PackageIdentifier: {{id}} PackageVersion: {{version}} From d3e1012f5055dc37967edb98893cf5fc575e0d25 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:39:27 -0700 Subject: [PATCH 09/14] Attempting with hard-coded values --- .github/workflows/release-winget.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index c0bc641ec..4ad0b10fa 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -15,6 +15,7 @@ jobs: uses: mjcheetham/update-winget@v1.1 with: id: Microsoft.GitCredentialManagerCore + version: 2.0.194.40577 token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe repo: ldennington/winget-playground From 0b0c8edd7e4df9b5baaf683948aa28af40c494d1 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:48:25 -0700 Subject: [PATCH 10/14] Removing branch --- .github/workflows/release-winget.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 4ad0b10fa..7ca80f64c 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -19,7 +19,6 @@ jobs: token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe repo: ldennington/winget-playground - branch: main manifestText: | PackageIdentifier: {{id}} PackageVersion: {{version}} @@ -32,9 +31,9 @@ jobs: ShortDescription: Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. Installers: - Arch: x86 - Url: {{url}} + Url: https://github.com/microsoft/Git-Credential-Manager-Core/releases/download/v2.0.194-beta/gcmcore-win-x86-2.0.194.40577.exe InstallerType: Inno - Sha256: {{sha256}} + Sha256: 26D3662F66E6AEC76C3BF155028D22D30ED8D1F1AFFA7C676F8DB0426939E8AD PackageLocale: en-US ManifestType: singleton ManifestVersion: 1.0.0 From 281eae06d51ef0d5093562acdd87d3bb9902ed8a Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 26 Apr 2021 14:53:06 -0700 Subject: [PATCH 11/14] Removing hard-coded values --- .github/workflows/release-winget.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 7ca80f64c..445af9bda 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -15,7 +15,6 @@ jobs: uses: mjcheetham/update-winget@v1.1 with: id: Microsoft.GitCredentialManagerCore - version: 2.0.194.40577 token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe repo: ldennington/winget-playground @@ -31,9 +30,9 @@ jobs: ShortDescription: Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. Installers: - Arch: x86 - Url: https://github.com/microsoft/Git-Credential-Manager-Core/releases/download/v2.0.194-beta/gcmcore-win-x86-2.0.194.40577.exe + Url: {{url}} InstallerType: Inno - Sha256: 26D3662F66E6AEC76C3BF155028D22D30ED8D1F1AFFA7C676F8DB0426939E8AD + Sha256: {{sha256}} PackageLocale: en-US ManifestType: singleton ManifestVersion: 1.0.0 From ac05a49a1d6a6a939e570885aa0909505a953f61 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Tue, 27 Apr 2021 12:24:50 -0700 Subject: [PATCH 12/14] Fixing manifest --- .github/workflows/release-winget.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 445af9bda..08565f401 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -25,14 +25,14 @@ jobs: Publisher: Microsoft Corporation Moniker: git-credential-manager-core PackageUrl: https://aka.ms/gcmcore - Tags: "gcm, gcmcore, git, credential" + Tags: [ gcm, gcmcore, git, credential ] 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: - - Arch: x86 - Url: {{url}} - InstallerType: Inno - Sha256: {{sha256}} + - Architecture: x86 + InstallerUrl: {{url}} + InstallerType: inno + InstallerSha256: {{sha256}} PackageLocale: en-US ManifestType: singleton ManifestVersion: 1.0.0 From a8088e2078b91b42a4d22998304d002e56249ee3 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Wed, 28 Apr 2021 13:01:12 -0700 Subject: [PATCH 13/14] Cleaning up --- .github/workflows/release-winget.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 08565f401..664f3ab9b 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -2,9 +2,6 @@ name: "release-winget" on: release: types: [released] - push: - branches: - - ldennington/update-winget-deployments jobs: release: @@ -12,7 +9,7 @@ jobs: steps: - id: update-winget name: Update winget repository - uses: mjcheetham/update-winget@v1.1 + uses: mjcheetham/update-winget@v1.2 with: id: Microsoft.GitCredentialManagerCore token: ${{ secrets.WINGET_TOKEN }} @@ -37,5 +34,3 @@ jobs: ManifestType: singleton ManifestVersion: 1.0.0 alwaysUsePullRequest: true - releaseRepo: 'microsoft/Git-Credential-Manager-Core' - releaseTag: 'v2.0.194-beta' From ce63156fd9f27c8a6594480c9d76684d315d1b33 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Thu, 29 Apr 2021 10:40:13 -0700 Subject: [PATCH 14/14] Removing repo --- .github/workflows/release-winget.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml index 664f3ab9b..12f9ed3a4 100644 --- a/.github/workflows/release-winget.yaml +++ b/.github/workflows/release-winget.yaml @@ -14,7 +14,6 @@ jobs: id: Microsoft.GitCredentialManagerCore token: ${{ secrets.WINGET_TOKEN }} releaseAsset: gcmcore-win-x86-(.*)\.exe - repo: ldennington/winget-playground manifestText: | PackageIdentifier: {{id}} PackageVersion: {{version}}