From 31d254cbed0bbd5243fd6777c046dd982845ae3c Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 11 Oct 2021 10:29:57 -0400 Subject: [PATCH 1/3] fixup! release: create initial Windows installer build workflow .github: use partial clone for build-extra Signed-off-by: Derrick Stolee --- .github/workflows/build-git-installers.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index e9acb3c56c05c1..ad081958c0948e 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -73,7 +73,7 @@ jobs: - name: Clone build-extra shell: bash run: | - git clone --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra + git clone --filter=blob:none --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra - name: Clone git shell: bash run: | @@ -170,7 +170,7 @@ jobs: - name: Clone build-extra shell: bash run: | - git clone --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra + git clone --filter=blob:none --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra - name: Prepare home directory for code-signing env: CODESIGN_P12: ${{secrets.CODESIGN_P12}} @@ -207,9 +207,13 @@ jobs: set -x b=/usr/src/build-extra && + str="recently_seen=.*\$" && - sed -i -e \ - 's/recently_seen="\$(get_recently_seen)"/recently_seen="bogus-to-keep-pestering"/' \ + echo $b/git-extra/git-update-git-for-windows && + cat $b/git-extra/git-update-git-for-windows && + + sed -i -e '/^# when confirmation to do so is given./a\ + use_recently_seen=no' \ $b/git-extra/git-update-git-for-windows - name: Set the installer Publisher to the Git Fundamentals team shell: bash From 1c1f6cfe2593fdb6a0ccc8763cd84058e126ede8 Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 11 Oct 2021 10:30:40 -0400 Subject: [PATCH 2/3] fixup! fixup! fixup! release: create initial Windows installer build workflow .github: fix errant 'filename' variable At this point in the script, 'filename' contains a relative path to a file, but that does not resolve correctly. Remove the variable and place the filename directly within the path. Signed-off-by: Derrick Stolee --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index ad081958c0948e..ddac0639100b9f 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -196,7 +196,7 @@ jobs: EOF sed -i -e '/^#include "file-list.iss"/a\ - Source: {#SourcePath}\\..\\'$filename'; DestDir: {app}\\mingw64\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore' \ + Source: {#SourcePath}\\..\\git-update-git-for-windows.config; DestDir: {app}\\mingw64\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore' \ -e '/^Type: dirifempty; Name: {app}\\{#MINGW_BITNESS}$/i\ Type: files; Name: {app}\\{#MINGW_BITNESS}\\bin\\git-update-git-for-windows.config\ Type: dirifempty; Name: {app}\\{#MINGW_BITNESS}\\bin' \ From bb4e5de46ed3279694fbd8e331843920cf0c23ae Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 11 Oct 2021 10:31:41 -0400 Subject: [PATCH 3/3] fixup! release: add Mac OSX installer build .github: fix macOS installer build Update the macOS version strings to versions that reflect the build machines and allow us to compile the release builds including FS Monitor. Signed-off-by: Derrick Stolee --- .github/workflows/build-git-installers.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index ddac0639100b9f..74bf21848ccd70 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -313,7 +313,7 @@ jobs: # Enable a bit stricter compile flags DEVELOPER: 1 # For the osx-installer build - OSX_VERSION: 10.6 + OSX_VERSION: 10.15 V: 1 steps: - name: Install git dependencies @@ -370,13 +370,13 @@ jobs: PATH=/usr/local/bin:/System/Library/Frameworks:$PATH \ make -C git_osx_installer \ - OSX_VERSION=10.6 C_INCLUDE_PATH="$C_INCLUDE_PATH" V=1 \ - build/intel-universal-snow-leopard/git-$VERSION/osx-built-keychain || + OSX_VERSION=10.15 C_INCLUDE_PATH="$C_INCLUDE_PATH" V=1 \ + build/intel-x86_64-catalina/git-$VERSION/osx-built-keychain || die "Build failed" PATH=/usr/local/bin:$PATH \ make -C git_osx_installer \ - OSX_VERSION=10.6 C_INCLUDE_PATH="$C_INCLUDE_PATH" V=1 image || + OSX_VERSION=10.15 C_INCLUDE_PATH="$C_INCLUDE_PATH" V=1 image || die "Build failed" mkdir -p artifacts