summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuhaib Mujahid <[email protected]>2020-10-26 21:09:26 -0400
committerGitHub <[email protected]>2020-10-26 18:09:26 -0700
commitad3ec3664d54779c4c2e49e41f85e886fbff343c (patch)
tree23265352f1bd0b3adcc412d4a1b638466bf315af
parentf83530b18dc46867ed06fc261b309b8b545a3b6f (diff)
Create v31 to support libgit2 v1.1.x (#668)
The libgit2 `v1.1.0` is released two weeks ago. This PR allows `git2go` to link against the new version.
-rw-r--r--.github/workflows/backport.yml5
-rw-r--r--README.md15
-rw-r--r--git_bundled_static.go4
-rw-r--r--git_system_dynamic.go4
-rw-r--r--git_system_static.go4
-rw-r--r--go.mod2
m---------vendor/libgit20
7 files changed, 18 insertions, 16 deletions
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 4337fb1..152239f 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -7,11 +7,12 @@ on:
jobs:
backport:
+ name: Backport change to branch ${{ matrix.branch }}
+ continue-on-error: true
strategy:
fail-fast: false
matrix:
- branch: [ 'release-0.28', 'release-0.27' ]
- name: Backport change to branch ${{ matrix.branch }}
+ branch: [ 'release-0.30', 'release-0.28', 'release-0.27' ]
runs-on: ubuntu-20.04
diff --git a/README.md b/README.md
index 79a96e9..d5b86e4 100644
--- a/README.md
+++ b/README.md
@@ -10,19 +10,20 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec
| libgit2 | git2go |
|---------|---------------|
-| master | (will be v31) |
+| master | (will be v32) |
+| 1.1 | v31 |
| 1.0 | v30 |
| 0.99 | v29 |
| 0.28 | v28 |
| 0.27 | v27 |
-You can import them in your project with the version's major number as a suffix. For example, if you have libgit2 v1.0 installed, you'd import git2go v30 with
+You can import them in your project with the version's major number as a suffix. For example, if you have libgit2 v1.1 installed, you'd import git2go v31 with:
```sh
-go get github.com/libgit2/git2go/v30
+go get github.com/libgit2/git2go/v31
```
```go
-import "github.com/libgit2/git2go/v30"
+import "github.com/libgit2/git2go/v31"
```
which will ensure there are no sudden changes to the API.
@@ -43,10 +44,10 @@ This project wraps the functionality provided by libgit2. If you're using a vers
### Versioned branch, dynamic linking
-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.0
+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.1
```go
-import "github.com/libgit2/git2go/v30"
+import "github.com/libgit2/git2go/v31"
```
### Versioned branch, static linking
@@ -76,7 +77,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/v30 ../../libgit2/git2go
+ replace github.com/libgit2/git2go/v31 ../../libgit2/git2go
Parallelism and network operations
----------------------------------
diff --git a/git_bundled_static.go b/git_bundled_static.go
index a5a590b..48d9be5 100644
--- a/git_bundled_static.go
+++ b/git_bundled_static.go
@@ -9,8 +9,8 @@ package git
#cgo CFLAGS: -DLIBGIT2_STATIC
#include <git2.h>
-#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0
-# error "Invalid libgit2 version; this git2go supports libgit2 v1.0"
+#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1
+# error "Invalid libgit2 version; this git2go supports libgit2 v1.1"
#endif
*/
import "C"
diff --git a/git_system_dynamic.go b/git_system_dynamic.go
index daed8ff..571a77f 100644
--- a/git_system_dynamic.go
+++ b/git_system_dynamic.go
@@ -7,8 +7,8 @@ package git
#cgo CFLAGS: -DLIBGIT2_DYNAMIC
#include <git2.h>
-#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0
-# error "Invalid libgit2 version; this git2go supports libgit2 v1.0"
+#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1
+# error "Invalid libgit2 version; this git2go supports libgit2 v1.1"
#endif
*/
import "C"
diff --git a/git_system_static.go b/git_system_static.go
index d30676a..3049763 100644
--- a/git_system_static.go
+++ b/git_system_static.go
@@ -7,8 +7,8 @@ package git
#cgo CFLAGS: -DLIBGIT2_STATIC
#include <git2.h>
-#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0
-# error "Invalid libgit2 version; this git2go supports libgit2 v1.0"
+#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1
+# error "Invalid libgit2 version; this git2go supports libgit2 v1.1"
#endif
*/
import "C"
diff --git a/go.mod b/go.mod
index c190305..42cdb9d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/libgit2/git2go/v30
+module github.com/libgit2/git2go/v31
go 1.13
diff --git a/vendor/libgit2 b/vendor/libgit2
-Subproject 7d3c7057f0e774aecd6fc4ef8333e69e5c4873e
+Subproject 7f4fa178629d559c037a1f72f79f79af9c1ef8c