From 113f589520803a66445ec28fc60532714c608be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Tr=C3=A9panier?= Date: Thu, 3 Aug 2023 12:04:20 -0400 Subject: [PATCH] Bump libgit2 to 1.7.0 --- .github/workflows/backport.yml | 2 +- .github/workflows/ci.yml | 2 +- Build_bundled_static.go | 4 ++-- Build_system_dynamic.go | 4 ++-- Build_system_static.go | 4 ++-- README.md | 11 ++++++----- go.mod | 2 +- vendor/libgit2 | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 64689346..ea4e9308 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [ 'release-1.5', 'release-1.3', 'release-1.2', 'release-1.1', 'release-1.0', 'release-0.28', 'release-0.27' ] + branch: [ 'release-1.6', 'release-1.5', 'release-1.3', 'release-1.2', 'release-1.1', 'release-1.0', 'release-0.28', 'release-0.27' ] runs-on: ubuntu-20.04 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd2b98bc..596285e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: fail-fast: false matrix: libgit2: - - 'v1.6.4' + - 'v1.7.0' name: Go (system-wide, dynamic) runs-on: ubuntu-20.04 diff --git a/Build_bundled_static.go b/Build_bundled_static.go index e61afae9..79a75e30 100644 --- a/Build_bundled_static.go +++ b/Build_bundled_static.go @@ -10,8 +10,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 6 || LIBGIT2_VER_MINOR > 6 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.6.x" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 7 || LIBGIT2_VER_MINOR > 7 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.7.x" #endif */ import "C" diff --git a/Build_system_dynamic.go b/Build_system_dynamic.go index 67fdacff..d0f5ac42 100644 --- a/Build_system_dynamic.go +++ b/Build_system_dynamic.go @@ -8,8 +8,8 @@ package git #cgo CFLAGS: -DLIBGIT2_DYNAMIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 6 || LIBGIT2_VER_MINOR > 6 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.6.x" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 7 || LIBGIT2_VER_MINOR > 7 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.7.x" #endif */ import "C" diff --git a/Build_system_static.go b/Build_system_static.go index 300c0b70..41f032f6 100644 --- a/Build_system_static.go +++ b/Build_system_static.go @@ -8,8 +8,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 6 || LIBGIT2_VER_MINOR > 6 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.6.x" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 7 || LIBGIT2_VER_MINOR > 7 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.7.x" #endif */ import "C" diff --git a/README.md b/README.md index 87dd05c6..7f77f711 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec | libgit2 | git2go | |---------|---------------| -| main | (will be v36) | +| main | (will be v37) | +| 1.7 | v36 | | 1.6 | v35 | | 1.5 | v34 | | 1.3 | v33 | @@ -24,10 +25,10 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec You can import them in your project with the version's major number as a suffix. For example, if you have libgit2 v1.2 installed, you'd import git2go v35 with: ```sh -go get github.com/libgit2/git2go/v35 +go get github.com/libgit2/git2go/v36 ``` ```go -import "github.com/libgit2/git2go/v35" +import "github.com/libgit2/git2go/v36" ``` which will ensure there are no sudden changes to the API. @@ -51,7 +52,7 @@ This project wraps the functionality provided by libgit2. If you're using a vers When linking dynamically against a released version of libgit2, install it via your system's package manager. CGo will take care of finding its pkg-config file and set up the linking. Import via Go modules, e.g. to work against libgit2 v1.2 ```go -import "github.com/libgit2/git2go/v35" +import "github.com/libgit2/git2go/v36" ``` ### Versioned branch, static linking @@ -81,7 +82,7 @@ In order to let Go pass the correct flags to `pkg-config`, `-tags static` needs One thing to take into account is that since Go expects the `pkg-config` file to be within the same directory where `make install-static` was called, so the `go.mod` file may need to have a [`replace` directive](https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive) so that the correct setup is achieved. So if `git2go` is checked out at `$GOPATH/src/github.com/libgit2/git2go` and your project at `$GOPATH/src/github.com/my/project`, the `go.mod` file of `github.com/my/project` might need to have a line like - replace github.com/libgit2/git2go/v35 => ../../libgit2/git2go + replace github.com/libgit2/git2go/v36 => ../../libgit2/git2go Parallelism and network operations ---------------------------------- diff --git a/go.mod b/go.mod index 617f02e6..b566bdeb 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/libgit2/git2go/v35 +module github.com/libgit2/git2go/v36 go 1.13 diff --git a/vendor/libgit2 b/vendor/libgit2 index e6325351..3e2baa6d 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit e6325351ceee58cf56f58bdce61b38907805544f +Subproject commit 3e2baa6d0bfb42f9016e24cba1733a6ae26a8ae6