Skip to content

Commit be5a99a

Browse files
authored
Rename the default branch to main (#786)
We've renamed the default branch from `master` to `main`, so we need to change a bunch of references to that.
1 parent fbaf9d1 commit be5a99a

File tree

5 files changed

+13
-38
lines changed

5 files changed

+13
-38
lines changed

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Backport to older releases
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
jobs:
88

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
push:
55
branches:
6-
- master
6+
- main
77
- release-*
88
- v*
99

@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up Go
4646
uses: actions/setup-go@v1
4747
with:
48-
go-version: '1.15'
48+
go-version: '1.17'
4949
id: go
5050
- name: Check out code into the Go module directory
5151
uses: actions/checkout@v1
@@ -70,7 +70,7 @@ jobs:
7070
- name: Set up Go
7171
uses: actions/setup-go@v1
7272
with:
73-
go-version: '1.15'
73+
go-version: '1.17'
7474
id: go
7575
- name: Check out code into the Go module directory
7676
uses: actions/checkout@v1
@@ -93,7 +93,7 @@ jobs:
9393
- name: Set up Go
9494
uses: actions/setup-go@v1
9595
with:
96-
go-version: '1.15'
96+
go-version: '1.17'
9797
id: go
9898
- name: Check out code into the Go module directory
9999
uses: actions/checkout@v1

.github/workflows/tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tag new releases
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
- release-*
77

88
jobs:

.travis.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
git2go
22
======
3-
[![GoDoc](https://godoc.org/github.com/libgit2/git2go?status.svg)](http://godoc.org/github.com/libgit2/git2go) [![Build Status](https://travis-ci.org/libgit2/git2go.svg?branch=master)](https://travis-ci.org/libgit2/git2go)
3+
[![GoDoc](https://godoc.org/github.com/libgit2/git2go?status.svg)](http://godoc.org/github.com/libgit2/git2go) [![Build Status](https://travis-ci.org/libgit2/git2go.svg?branch=main)](https://travis-ci.org/libgit2/git2go)
44

55
Go bindings for [libgit2](http://libgit2.github.com/).
66

@@ -10,7 +10,7 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec
1010

1111
| libgit2 | git2go |
1212
|---------|---------------|
13-
| master | (will be v32) |
13+
| main | (will be v32) |
1414
| 1.1 | v31 |
1515
| 1.0 | v30 |
1616
| 0.99 | v29 |
@@ -28,7 +28,7 @@ import "github.com/libgit2/git2go/v31"
2828

2929
which will ensure there are no sudden changes to the API.
3030

31-
The `master` branch follows the tip of libgit2 itself (with some lag) and as such has no guarantees on the stability of libgit2's API. Thus this only supports statically linking against libgit2.
31+
The `main` branch follows the tip of libgit2 itself (with some lag) and as such has no guarantees on the stability of libgit2's API. Thus this only supports statically linking against libgit2.
3232

3333
### Which branch to send Pull requests to
3434

@@ -58,16 +58,16 @@ Follow the instructions for [Versioned branch, dynamic linking](#versioned-branc
5858
go test -tags static,system_libgit2 github.com/my/project/...
5959
go install -tags static,system_libgit2 github.com/my/project/...
6060

61-
### Master branch, or vendored static linking
61+
### `main` branch, or vendored static linking
6262

63-
If using `master` or building a branch with the vendored libgit2 statically, we need to build libgit2 first. In order to build it, you need `cmake`, `pkg-config` and a C compiler. You will also need the development packages for OpenSSL (outside of Windows or macOS) and LibSSH2 installed if you want libgit2 to support HTTPS and SSH respectively. Note that even if libgit2 is included in the resulting binary, its dependencies will not be.
63+
If using `main` or building a branch with the vendored libgit2 statically, we need to build libgit2 first. In order to build it, you need `cmake`, `pkg-config` and a C compiler. You will also need the development packages for OpenSSL (outside of Windows or macOS) and LibSSH2 installed if you want libgit2 to support HTTPS and SSH respectively. Note that even if libgit2 is included in the resulting binary, its dependencies will not be.
6464

6565
Run `go get -d github.com/libgit2/git2go` to download the code and go to your `$GOPATH/src/github.com/libgit2/git2go` directory. From there, we need to build the C code and put it into the resulting go binary.
6666

6767
git submodule update --init # get libgit2
6868
make install-static
6969

70-
will compile libgit2, link it into git2go and install it. The `master` branch is set up to follow the specific libgit2 version that is vendored, so trying dynamic linking may or may not work depending on the exact versions involved.
70+
will compile libgit2, link it into git2go and install it. The `main` branch is set up to follow the specific libgit2 version that is vendored, so trying dynamic linking may or may not work depending on the exact versions involved.
7171

7272
In order to let Go pass the correct flags to `pkg-config`, `-tags static` needs to be passed to all `go` commands that build any binaries. For instance:
7373

@@ -87,7 +87,7 @@ libgit2 may use OpenSSL and LibSSH2 for performing encrypted network connections
8787
Running the tests
8888
-----------------
8989

90-
For the stable version, `go test` will work as usual. For the `master` branch, similarly to installing, running the tests requires building a local libgit2 library, so the Makefile provides a wrapper that makes sure it's built
90+
For the stable version, `go test` will work as usual. For the `main` branch, similarly to installing, running the tests requires building a local libgit2 library, so the Makefile provides a wrapper that makes sure it's built
9191

9292
make test-static
9393

0 commit comments

Comments
 (0)