Skip to content
This repository was archived by the owner on Jul 13, 2022. It is now read-only.

Commit dec9d8b

Browse files
committed
removed all generated files, use go generate instead
1 parent 19ce248 commit dec9d8b

File tree

213 files changed

+152
-21423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+152
-21423
lines changed

.github/workflows/linter.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ jobs:
2727
run: |
2828
pacman -Syu --needed --noconfirm go protobuf
2929
30+
- name: Run go generate
31+
run: |
32+
go generate proto.go
33+
go generate
34+
3035
- name: golangci-lint
3136
uses: golangci/[email protected]
3237
with:

.github/workflows/release.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ jobs:
5353
run: |
5454
pacman -Syu --needed --noconfirm go protobuf wget zip
5555
56+
- name: Run go generate
57+
run: |
58+
unset GOOS
59+
unset GOARCH
60+
unset GOARM
61+
unset CGO_ENABLED
62+
go generate proto.go
63+
go generate
64+
5665
- name: Build V2Ray
5766
run: |
5867
mkdir -p build_assets

.github/workflows/test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ on:
2222

2323
jobs:
2424
test:
25-
strategy:
26-
fail-fast: false
2725
runs-on: ubuntu-latest
2826
container:
2927
image: archlinux/archlinux:base-devel
@@ -34,6 +32,11 @@ jobs:
3432
3533
- uses: actions/checkout@v2
3634

35+
- name: Run go generate
36+
run: |
37+
go generate proto.go
38+
go generate
39+
3740
- name: Check Go modules
3841
run: |
3942
go mod tidy

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Protobuf generated files
2+
*.pb.go
3+
4+
# errorgen
5+
errors.generated.go
6+
17
# Binaries for programs and plugins
28
*.exe
39
*.exe~
@@ -24,5 +30,5 @@ mockgen
2430
vprotogen
2531
!infra/vprotogen/
2632
errorgen
27-
!common/errors/errorgen/
33+
!infra/errorgen/
2834
*.dat

app/browserforwarder/config.pb.go

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

app/browserforwarder/errors.generated.go

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

app/browserforwarder/forwarder.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import (
2121
"github.com/v2fly/BrowserBridge/handler"
2222
)
2323

24-
//go:generate go run github.com/Shadowsocks-NET/v2ray-go/v4/common/errors/errorgen
25-
2624
type Forwarder struct {
2725
ctx context.Context
2826

app/commander/commander.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
package commander
55

6-
//go:generate go run github.com/Shadowsocks-NET/v2ray-go/v4/common/errors/errorgen
7-
86
import (
97
"context"
108
"net"

0 commit comments

Comments
 (0)