Skip to content

Commit f874eea

Browse files
Merge pull request #469: [HOTFIX] Update Git to include GCM Core update
This updates on top of the 20.10.178 release. Requires build updates from #466. This actually updates to a better build: 1. It has a new tag `v2.29.0.vfs.0.1`. 2. It was created after `git-for-windows/build-extra` updated with the new GCM Core package.
2 parents d2c5570 + 1caf585 commit f874eea

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ jobs:
4343

4444
- name: Setup platform (Linux)
4545
if: runner.os == 'Linux'
46-
run: echo "::set-env name=BUILD_PLATFORM::${{ runner.os }}"
46+
run: echo "BUILD_PLATFORM=${{ runner.os }}" >>$GITHUB_ENV
4747

4848
- name: Setup platform (Mac)
4949
if: runner.os == 'macOS'
50-
run: echo '::set-env name=BUILD_PLATFORM::Mac'
50+
run: echo 'BUILD_PLATFORM=Mac' >>$GITHUB_ENV
5151

5252
- name: Setup platform (Windows)
5353
if: runner.os == 'Windows'
5454
run: |
55-
echo "::set-env name=BUILD_PLATFORM::${{ runner.os }}"
56-
echo '::set-env name=BUILD_FILE_EXT::.exe'
55+
echo "BUILD_PLATFORM=${{ runner.os }}" >>$env:GITHUB_ENV
56+
echo 'BUILD_FILE_EXT=.exe' >>$env:GITHUB_ENV
5757
5858
- name: Setup Git installer
5959
shell: bash
@@ -125,7 +125,7 @@ jobs:
125125
Copy-Item -Path 'watchman\watchman-*-windows\bin\*' -Destination 'C:\Program Files\Watchman'
126126
$ENV:PATH="$ENV:PATH;C:\Program Files\Watchman"
127127
& watchman --version
128-
echo "::add-path::C:\Program Files\Watchman"
128+
echo "PATH=$ENV:PATH" >>$env:GITHUB_ENV
129129
130130
- name: Functional test
131131
shell: bash

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
VFS for Git (which is less flexible). Only update that version if we rely upon a
4444
new command-line interface in Git or if there is a truly broken interaction.
4545
-->
46-
<GitPackageVersion>2.20201020.1</GitPackageVersion>
46+
<GitPackageVersion>2.20201209.2</GitPackageVersion>
4747
<MinimumGitVersion>v2.25.0.vfs.1.1</MinimumGitVersion>
4848

4949
<WatchmanPackageUrl>https://github.com/facebook/watchman/releases/download/v2020.08.03.00/watchman-v2020.08.03.00-windows.zip</WatchmanPackageUrl>

0 commit comments

Comments
 (0)