Skip to content

Improve libgit2 build reliability #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 5 commits into from
Sep 22, 2026
Merged

Improve libgit2 build reliability #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fb831e
Improve libgit2 build reliability
hbmartin Jul 14, 2026
9ec0c95
Do not exclude x86_64 from the build configurations
claude Sep 21, 2026
28aeb09
Key the libgit2 freshness check on the submodule revision
claude Sep 21, 2026
1c6bda2
Use the matrix architecture in the pull request workflow
claude Sep 21, 2026
7960a6c
Merge gitx/master into codex/libgit2-build-reliability
claude Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/BuildPR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ jobs:
run: |
brew unlink openssl@3
# - name: Test project
# run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.arch }}"
# run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.abi }}"
- name: Archive project
run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" archive ARCHS="${{ matrix.arch }}"
run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" archive ARCHS="${{ matrix.abi }}"

@hannesa2 hannesa2 Sep 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed there was a bug !

1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ objective-git.bridgesupport
ObjectiveGitFramework/build/*
ObjectiveGit-iOS.framework/*
External/*.a
External/*.stamp
External/*.dylib

*.pbxuser
Expand Down
2 changes: 2 additions & 0 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,13 +1386,15 @@
};
D0A330F116027F2300A616FA /* libgit2 */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = libgit2;
outputPaths = (
"$(SRCROOT)/External/libgit2.a",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
54 changes: 48 additions & 6 deletions script/update_libgit2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,45 @@

set -e

cd "External/libgit2"
# Resolve the repository root so the script behaves identically whether CI runs
# it from the root or Xcode runs it from $SRCROOT.
script_dir=$(cd "$(dirname "$0")" && pwd)
script_path="$script_dir/$(basename "$0")"
root=$(cd "$script_dir/.." && pwd)
cd "$root"

submodule="$root/External/libgit2"
archive="$root/External/libgit2.a"
stamp="$root/External/libgit2.a.stamp"

# A key identifying the archive we would produce. It covers the submodule
# revision, so switching revisions invalidates the archive even when the new
# revision only deletes or renames sources; the submodule working tree, so
# local edits and deletions invalidate it; the host architecture, since the
# archive is built for the host only; and this script, so changing the cmake
# flags invalidates it. If any part of the key cannot be computed we rebuild
# rather than trust an archive we cannot account for.
build_key() {
git -C "$submodule" rev-parse HEAD || return 1
git -C "$submodule" status --porcelain --untracked-files=all \
-- . ':(exclude)build' || return 1
Comment on lines +25 to +26

@hannesa2 hannesa2 Sep 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it's a High finding, I'll give Copilot a try ...

@hannesa2 hannesa2 Sep 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I don't do it with Copilot 😁
image

@hannesa2 hannesa2 Sep 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be an alternative: copy&past from google

BUILD_KEY=$(
  (
    git -C "$submodule" ls-files -s -- . ':(exclude)build'
    git -C "$submodule" ls-files -o --exclude-standard -- . ':(exclude)build'
  ) | sort -u | git -C "$submodule" hash-object --stdin
) || return 1

uname -m || return 1
git hash-object "$script_path" || return 1
}

key=$(build_key) || key=''

if [ -n "$key" ] && [ -f "$archive" ] && [ -f "$stamp" ] &&
[ "$key" = "$(cat "$stamp")" ]; then
echo "libgit2 is up to date."
exit 0
fi

# Drop the stamp before building: if the build fails or is interrupted, the
# archive left behind must not look up to date on the next run.
rm -f "$stamp"

cd "$submodule"

if [ -d "build" ]; then
rm -rf "build"
Expand All @@ -12,7 +50,7 @@ mkdir build
cd build

# OpenSSL is keg-only, so add its pkgconfig location manually
if [[ $(uname -m) == 'arm64' ]]; then
if [ "$(uname -m)" = 'arm64' ]; then
echo "Running on a Apple Silicon M1"
export ARCH_PREFIX=/opt/homebrew
else
Expand All @@ -34,9 +72,13 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \
..
cmake --build .

product="libgit2.a"
install_path="../../${product}"
rm -rf $install_path
cp -v "${product}" "${install_path}"
rm -f "$archive"
cp -v "libgit2.a" "$archive"

if [ -n "$key" ]; then
printf '%s\n' "$key" > "$stamp"
else
echo "Could not record a libgit2 build stamp; libgit2 will be rebuilt next time." >&2
fi

echo "libgit2 has been updated."
Loading