Merge pull request #2 from coveord/libgit2-v1.6.4
Update libgit2 to v1.6.4
This commit is contained in:
William Trépanier
GitHub
commit
0d0aa5007a
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
branch: [ 'release-1.3', 'release-1.2', 'release-1.1', 'release-1.0', 'release-0.28', 'release-0.27' ]
|
||||
branch: [ '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
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
libgit2:
|
||||
- 'v1.5.0'
|
||||
- 'v1.6.4'
|
||||
name: Go (system-wide, dynamic)
|
||||
|
||||
runs-on: ubuntu-20.04
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ package git
|
|||
#cgo CFLAGS: -DLIBGIT2_STATIC
|
||||
#include <git2.h>
|
||||
|
||||
#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 5 || LIBGIT2_VER_MINOR > 5
|
||||
# error "Invalid libgit2 version; this git2go supports libgit2 between v1.5.0 and v1.5.0"
|
||||
#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 6 || LIBGIT2_VER_MINOR > 6
|
||||
# error "Invalid libgit2 version; this git2go supports libgit2 v1.6.x"
|
||||
#endif
|
||||
*/
|
||||
import "C"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ package git
|
|||
#cgo CFLAGS: -DLIBGIT2_DYNAMIC
|
||||
#include <git2.h>
|
||||
|
||||
#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 5 || LIBGIT2_VER_MINOR > 5
|
||||
# error "Invalid libgit2 version; this git2go supports libgit2 between v1.5.0 and v1.5.0"
|
||||
#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 6 || LIBGIT2_VER_MINOR > 6
|
||||
# error "Invalid libgit2 version; this git2go supports libgit2 v1.6.x"
|
||||
#endif
|
||||
*/
|
||||
import "C"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ package git
|
|||
#cgo CFLAGS: -DLIBGIT2_STATIC
|
||||
#include <git2.h>
|
||||
|
||||
#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 5 || LIBGIT2_VER_MINOR > 5
|
||||
# error "Invalid libgit2 version; this git2go supports libgit2 between v1.5.0 and v1.5.0"
|
||||
#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 6 || LIBGIT2_VER_MINOR > 6
|
||||
# error "Invalid libgit2 version; this git2go supports libgit2 v1.6.x"
|
||||
#endif
|
||||
*/
|
||||
import "C"
|
||||
|
|
|
|||
13
README.md
13
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 v35) |
|
||||
| main | (will be v36) |
|
||||
| 1.6 | v35 |
|
||||
| 1.5 | v34 |
|
||||
| 1.3 | v33 |
|
||||
| 1.2 | v32 |
|
||||
|
|
@ -20,13 +21,13 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec
|
|||
| 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.2 installed, you'd import git2go v34 with:
|
||||
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/v34
|
||||
go get github.com/libgit2/git2go/v35
|
||||
```
|
||||
```go
|
||||
import "github.com/libgit2/git2go/v34"
|
||||
import "github.com/libgit2/git2go/v35"
|
||||
```
|
||||
|
||||
which will ensure there are no sudden changes to the API.
|
||||
|
|
@ -50,7 +51,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/v34"
|
||||
import "github.com/libgit2/git2go/v35"
|
||||
```
|
||||
|
||||
### Versioned branch, static linking
|
||||
|
|
@ -80,7 +81,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/v34 => ../../libgit2/git2go
|
||||
replace github.com/libgit2/git2go/v35 => ../../libgit2/git2go
|
||||
|
||||
Parallelism and network operations
|
||||
----------------------------------
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -1,4 +1,4 @@
|
|||
module github.com/libgit2/git2go/v34
|
||||
module github.com/libgit2/git2go/v35
|
||||
|
||||
go 1.13
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit fbea439d4b6fc91c6b619d01b85ab3b7746e4c19
|
||||
Subproject commit e6325351ceee58cf56f58bdce61b38907805544f
|
||||
Loading…
Reference in New Issue