From a41b2f19667f255b4a6646ad642c11d13a91648c Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Wed, 6 Oct 2021 15:45:07 -0400 Subject: [PATCH 1/2] .github: continue pestering until user upgrades In 'git-update-git-for-windows', there is a recently_seen variable that is loaded from Git config. This is intended to allow users to say "No, I don't want that version of Git for Windows." If users say no, then they are not reminded. Ever. We want users of microsoft/git to be notified repeately until they upgrade. The first notification might be dismissed because they don't want to interrupt their work. They should get the picture within a few reminders and upgrade in a timely fashion. Signed-off-by: Derrick Stolee --- .github/workflows/build-git-installers.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 100493bad4177a..75702aba48df7c 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -201,6 +201,16 @@ jobs: Type: files; Name: {app}\\{#MINGW_BITNESS}\\bin\\git-update-git-for-windows.config\ Type: dirifempty; Name: {app}\\{#MINGW_BITNESS}\\bin' \ $b/installer/install.iss + - name: Set alerts to continue until upgrade is taken + shell: bash + run: | + set -x + + b=/usr/src/build-extra && + + sed -i -e \ + 's/recently_seen="\$(get_recently_seen)"/recently_seen="bogus-to-keep-pestering"/' \ + $b/git-extra/git-update-git-for-windows - name: Set the installer Publisher to the Git Fundamentals team shell: bash run: | From 2cd09c0c86d3e14409f9b0c27c8b28522665ffd0 Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Wed, 6 Oct 2021 15:51:15 -0400 Subject: [PATCH 2/2] fixup! fixup! release: create initial Windows installer build workflow Signed-off-by: Derrick Stolee --- .github/workflows/build-git-installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 75702aba48df7c..e9acb3c56c05c1 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -190,10 +190,10 @@ jobs: b=/usr/src/build-extra && filename=$b/git-update-git-for-windows.config - tr % '\t' >$filename <<-\EOF + tr % '\t' >$filename <<-\EOF && [update] %fromFork = microsoft/git - EOF && + EOF sed -i -e '/^#include "file-list.iss"/a\ Source: {#SourcePath}\\..\\'$filename'; DestDir: {app}\\mingw64\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore' \