Skip to content

Commit f9eacf7

Browse files
zawatazawata
authored
Merge pull request #6 from gitkraken/bump/git-2.45.2
bump git to 2.45.2
2 parents f540e81 + b71dbd3 commit f9eacf7

File tree

6 files changed

+25
-97
lines changed

6 files changed

+25
-97
lines changed

‎.github/workflows/ci.yml

+15-50
Original file line numberDiff line numberDiff line change
@@ -25,53 +25,41 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [macos-11, windows-2019, ubuntu-20.04]
29-
arch: [x86, x64]
28+
os: [macos-latest, windows-latest, ubuntu-20.04]
29+
arch: [x64, arm64]
3030
include:
31-
- os: macos-11
31+
- os: macos-latest
3232
friendlyName: macOS
3333
targetPlatform: macOS
34-
- os: macos-11
35-
friendlyName: macOS
36-
targetPlatform: macOS
37-
arch: arm64
38-
- os: windows-2019
34+
- os: windows-latest
3935
friendlyName: Windows
4036
targetPlatform: win32
4137
- os: ubuntu-20.04
4238
friendlyName: Linux
4339
targetPlatform: ubuntu
44-
- os: ubuntu-20.04
45-
friendlyName: Linux
46-
targetPlatform: ubuntu
47-
arch: arm64
48-
- os: ubuntu-20.04
49-
friendlyName: Linux
50-
targetPlatform: ubuntu
51-
arch: arm
5240
exclude:
53-
- os: macos-11
54-
arch: x86
55-
- os: windows-2019
56-
arch: x86
41+
- os: windows-latest
42+
arch: arm64
5743
timeout-minutes: 20
5844
steps:
59-
# We need to use Xcode 11.7 for maximum compatibility with older macOS (x64)
60-
- name: Switch to Xcode 11.7
45+
# We need to use Xcode 14.3 for maximum compatibility with older macOS (x64)
46+
- name: Switch to oldest available Xcode
6147
if: matrix.targetPlatform == 'macOS' && matrix.arch == 'x64'
6248
run: |
63-
sudo xcode-select -s /Applications/Xcode_11.7.app/Contents/Developer/
49+
sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer/
6450
# Delete the command line tools to make sure they don't get our builds
65-
# messed up with macOS SDK 11 stuff.
51+
# messed up with macOS SDK stuff.
6652
sudo rm -rf /Library/Developer/CommandLineTools
67-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v4
6854
with:
6955
submodules: recursive
7056
# Needed for script/package.sh to work
7157
fetch-depth: 0
7258
- name: Install go
7359
if: matrix.targetPlatform == 'macOS'
74-
uses: actions/setup-go@v2
60+
uses: actions/setup-go@v5
61+
with:
62+
go-version: 'stable'
7563
- name: Install dependencies
7664
run: npm install
7765
- name: Check formatting
@@ -83,12 +71,6 @@ jobs:
8371
run: |
8472
sudo apt-get update
8573
sudo apt-get install libcurl4-gnutls-dev libexpat1-dev gettext
86-
- name: Install extra dependencies for building Git on Ubuntu (x86)
87-
if: matrix.targetPlatform == 'ubuntu' && matrix.arch == 'x86'
88-
run: |
89-
sudo dpkg --add-architecture i386
90-
sudo apt-get update
91-
sudo apt-get install gcc-i686-linux-gnu binutils-i686-gnu libcurl4-gnutls-dev:i386 zlib1g-dev:i386 gettext
9274
- name: Install extra dependencies for building Git on Ubuntu (arm64)
9375
if: matrix.targetPlatform == 'ubuntu' && matrix.arch == 'arm64'
9476
run: |
@@ -98,24 +80,7 @@ jobs:
9880
sudo dpkg --add-architecture arm64
9981
sudo apt-get update
10082
sudo apt-get install gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu libcurl4-gnutls-dev:arm64 zlib1g-dev:arm64 gettext
101-
- name: Install extra dependencies for building Git on Ubuntu (arm)
102-
if: matrix.targetPlatform == 'ubuntu' && matrix.arch == 'arm'
103-
run: |
104-
sudo sed -i "s/^deb/deb [arch=amd64,i386]/g" /etc/apt/sources.list
105-
echo "deb [arch=arm64,armhf] http://azure.ports.ubuntu.com/ $(lsb_release -s -c) main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
106-
echo "deb [arch=arm64,armhf] http://azure.ports.ubuntu.com/ $(lsb_release -s -c)-updates main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
107-
sudo dpkg --add-architecture armhf
108-
sudo apt-get update
109-
sudo apt-get install gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabihf libcurl4-gnutls-dev:armhf zlib1g-dev:armhf gettext
110-
- name: Build (except macOS arm64)
111-
if: matrix.targetPlatform != 'macOS' || matrix.arch != 'arm64'
112-
shell: bash
113-
run: script/build.sh
114-
env:
115-
TARGET_PLATFORM: ${{ matrix.targetPlatform }}
116-
TARGET_ARCH: ${{ matrix.arch }}
117-
- name: Build (macOS arm64)
118-
if: matrix.targetPlatform == 'macOS' && matrix.arch == 'arm64'
83+
- name: Build
11984
shell: bash
12085
run: script/build.sh
12186
env:

‎dependencies.json

+4-22
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"git": {
3-
"version": "v2.44.1",
3+
"version": "v2.45.2",
44
"packages": [
55
{
66
"platform": "windows",
77
"arch": "amd64",
8-
"filename": "PortableGit-2.44.1-64-bit.7z.exe",
9-
"url": "https://github.com/git-for-windows/git/releases/download/v2.44.1.windows.1/PortableGit-2.44.1-64-bit.7z.exe",
10-
"checksum": "1300ebcd98e91df53f4a0af9bfd955450f7a362aa1e8f6126eb2aa437bf7e497"
8+
"filename": "PortableGit-2.45.2-64-bit.7z.exe",
9+
"url": "https://github.com/git-for-windows/git/releases/download/v2.45.2.windows.1/PortableGit-2.45.2-64-bit.7z.exe",
10+
"checksum": "851a15074dea6b272785b2a2a4697a72970256de2afe7b8e4a9c5e168c27ccdd"
1111
}
1212
]
1313
},
@@ -20,30 +20,12 @@
2020
"name": "git-lfs-linux-amd64-v3.5.1.tar.gz",
2121
"checksum": "6f28eb19faa7a968882dca190d92adc82493378b933958d67ceaeb9ebe4d731e"
2222
},
23-
{
24-
"platform": "linux",
25-
"arch": "x86",
26-
"name": "git-lfs-linux-386-v3.5.1.tar.gz",
27-
"checksum": "4436bbc404427b2ca24108582cb1945dd806851d8634d287b8f37fb211718bee"
28-
},
2923
{
3024
"platform": "linux",
3125
"arch": "arm64",
3226
"name": "git-lfs-linux-arm64-v3.5.1.tar.gz",
3327
"checksum": "4f8700aacaa0fd26ae5300fb0996aed14d1fd0ce1a63eb690629c132ff5163a9"
3428
},
35-
{
36-
"platform": "linux",
37-
"arch": "arm",
38-
"name": "git-lfs-linux-arm-v3.5.1.tar.gz",
39-
"checksum": "03923d8badf5c382920390414ad7084c5d87b246b180474d09961e3831f552e2"
40-
},
41-
{
42-
"platform": "windows",
43-
"arch": "x86",
44-
"name": "git-lfs-windows-386-v3.5.1.zip",
45-
"checksum": "ea5138789c4f19ed71d30c3e407f43bd270771028d37e5292378a8ea2c154377"
46-
},
4729
{
4830
"platform": "windows",
4931
"arch": "amd64",

‎git

Submodule git updated 521 files

‎script/build-macos.sh

+3-13
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55

66
set -eu -o pipefail
77

8-
MACOSX_BUILD_VERSION="10.9"
8+
MACOSX_BUILD_VERSION="10.15"
9+
HOST_CPU=arm64
910

1011
if [ "$TARGET_ARCH" = "x64" ]; then
11-
HOST_CPU=x86_64
1212
TARGET_CFLAGS="-target x86_64-apple-darwin"
1313
GOARCH=amd64
1414
else
15-
HOST_CPU=arm64
1615
TARGET_CFLAGS="-target arm64-apple-darwin"
1716
GOARCH=arm64
1817
fi
@@ -76,16 +75,7 @@ if [[ "$GIT_LFS_VERSION" ]]; then
7675
git clone -b "v$GIT_LFS_VERSION" "https://github.com/git-lfs/git-lfs"
7776
(
7877
cd git-lfs
79-
80-
# HACK: When cross-compiling, there seems to be an issue when git-lfs attempts
81-
# to generate the manpage contents, and it seems that preffixing that command
82-
# with `GOARCH=` to use the host architecture fixes the issue.
83-
# This hack can be removed once the issue is fixed via the PR
84-
# https://github.com/git-lfs/git-lfs/pull/4492 or some other solution.
85-
GO_GENERATE_STRING="\$(GO) generate github.com\/git-lfs\/git-lfs\/commands"
86-
sed -i -e "s/$GO_GENERATE_STRING/GOARCH= $GO_GENERATE_STRING/" Makefile
87-
88-
make GOARCH="$GOARCH" CGO_CFLAGS="-mmacosx-version-min=$MACOSX_BUILD_VERSION" CGO_LDFLAGS="-mmacosx-version-min=$MACOSX_BUILD_VERSION" BUILTIN_LD_FLAGS="-linkmode external"
78+
make GOARCH="$GOARCH" CGO_ENABLED=1 CGO_CFLAGS="-mmacosx-version-min=$MACOSX_BUILD_VERSION" CGO_LDFLAGS="-mmacosx-version-min=$MACOSX_BUILD_VERSION" BUILTIN_LD_FLAGS="-linkmode external"
8979
)
9080
GIT_LFS_BINARY_PATH="git-lfs/bin/git-lfs"
9181
if test -f "$GIT_LFS_BINARY_PATH"; then

‎script/generate-release-notes.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import * as fs from 'fs'
44
import { Octokit } from '@octokit/rest'
55

66
export default class GenerateReleaseNotes {
7-
// seven targeted OS/arch combinations
7+
// five targeted OS/arch combinations
88
// two files for each targeted OS/arch
99
// two checksum files for the previous
10-
private SUCCESSFUL_RELEASE_FILE_COUNT = 7 * 2 * 2
10+
private SUCCESSFUL_RELEASE_FILE_COUNT = 5 * 2 * 2
1111
private args = process.argv.slice(2)
1212
private expectedArgs = [
1313
{

‎script/update-git-lfs.ts

-9
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,9 @@ function getArch(fileName: string) {
2424
if (fileName.match(/-amd64-/)) {
2525
return 'amd64'
2626
}
27-
if (fileName.match(/-386-/)) {
28-
return 'x86'
29-
}
3027
if (fileName.match(/-arm64-/)) {
3128
return 'arm64'
3229
}
33-
if (fileName.match(/-arm-/)) {
34-
return 'arm'
35-
}
3630

3731
throw new Error(`Unable to find arch for file: ${fileName}`)
3832
}
@@ -88,10 +82,7 @@ async function run(): Promise<boolean> {
8882

8983
const files = [
9084
`git-lfs-linux-amd64-${version}.tar.gz`,
91-
`git-lfs-linux-386-${version}.tar.gz`,
9285
`git-lfs-linux-arm64-${version}.tar.gz`,
93-
`git-lfs-linux-arm-${version}.tar.gz`,
94-
`git-lfs-windows-386-${version}.zip`,
9586
`git-lfs-windows-amd64-${version}.zip`,
9687
]
9788

0 commit comments

Comments
 (0)