jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Generate stringer files automatically #841

Merged
g4s8 merged 6 commits from 543-stringer-generate into main 2021-11-08 08:38:55 -06:00
Conversation 2 Commits 6 Files Changed 3 +29
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/ci.yml vendored
View File

@ -105,3 +105,26 @@ jobs:
sudo ./script/build-libgit2.sh --static --system
- name: Test
run: go test --count=1 --tags "static,system_libgit2" ./...
check-generate:
name: Check generated files were not modified
runs-on: ubuntu-20.04
steps:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: '1.17'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: Install libgit2 build dependencies
run: |
git submodule update --init
sudo apt-get install -y --no-install-recommends libssh2-1-dev
lhchavez commented 2021-11-08 08:27:42 -06:00 (Migrated from github.com)
Review
Copy Link
        sudo apt-get install -y --no-install-recommends libssh2-1-dev
        go install golang.org/x/tools/cmd/stringer@latest

haha, stringer wasn't installed! (and we may need to tweak PATH unless GH does it for us)

```suggestion sudo apt-get install -y --no-install-recommends libssh2-1-dev go install golang.org/x/tools/cmd/stringer@latest ``` haha, `stringer` wasn't installed! (and we may need to tweak `PATH` unless GH does it for us)
go install golang.org/x/tools/cmd/stringer@latest
- name: Generate files
lhchavez commented 2021-11-08 07:55:26 -06:00 (Migrated from github.com)
Review
Copy Link
    - name: Install libgit2 build dependencies
      run: |
        git submodule update --init
        sudo apt-get install -y --no-install-recommends libssh2-1-dev
    - name: Generate files

oops, forgot this last round! otherwise make generate will fail because CGo won't be able to find git2.h: https://github.com/libgit2/git2go/runs/4139740720?check_suite_focus=true (note that this depends on the suggestion that was left in Makefile to work correctly).

```suggestion - name: Install libgit2 build dependencies run: | git submodule update --init sudo apt-get install -y --no-install-recommends libssh2-1-dev - name: Generate files ``` oops, forgot this last round! otherwise `make generate` will fail because CGo won't be able to find `git2.h`: https://github.com/libgit2/git2go/runs/4139740720?check_suite_focus=true (note that this depends on the suggestion that was left in `Makefile` to work correctly).
run: |
export PATH=$(go env GOPATH)/bin:$PATH
make generate
- name: Check nothing changed
run: git diff --quiet --exit-code || (echo "detected changes after generate" ; git status ; exit 1)

4
Makefile
View File

@ -2,6 +2,10 @@ TEST_ARGS ?= --count=1
default: test
generate: static-build/install/lib/libgit2.a
go generate --tags "static" ./...
# System library
# ==============
# This uses whatever version of libgit2 can be found in the system.

2
git.go
View File

@ -14,6 +14,7 @@ import (
"unsafe"
)
//go:generate stringer -type ErrorClass -trimprefix ErrorClass -tags static
type ErrorClass int
const (
@ -48,6 +49,7 @@ const (
ErrorClassPatch ErrorClass = C.GIT_ERROR_PATCH
)
//go:generate stringer -type ErrorCode -trimprefix ErrorCode -tags static
type ErrorCode int
const (