Skip to content

Commit

Permalink
Remove protos (got moved to https://buf.build/minekube/connect/assets…
Browse files Browse the repository at this point in the history
  • Loading branch information
robinbraemer committed May 17, 2023
1 parent a46e9f1 commit 336108b
Show file tree
Hide file tree
Showing 27 changed files with 286 additions and 2,623 deletions.
34 changes: 0 additions & 34 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ permissions:
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read

env:
BUF_DIR: api

jobs:
lint:
name: lint
Expand All @@ -30,37 +27,6 @@ jobs:
version: latest
args: --timeout 3m0s

lint-buf:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: bufbuild/buf-setup-action@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Buf lint
uses: bufbuild/buf-lint-action@v1
with:
input: ${{ env.BUF_DIR }}

- name: Buf breaking PR
if: github.ref != 'refs/heads/main'
uses: bufbuild/buf-breaking-action@v1
with:
input: ${{ env.BUF_DIR }}
# The 'main' branch of the GitHub repository that defines the module.
against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=${{ env.BUF_DIR }}"

- name: Buf breaking
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
uses: bufbuild/buf-breaking-action@v1
with:
input: ${{ env.BUF_DIR }}
# The 'main' branch of the GitHub repository that defines the module.
against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,ref=HEAD~1,subdir=${{ env.BUF_DIR }}"

test:
runs-on: ubuntu-latest
steps:
Expand Down
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,16 @@ fmt:

# Run go fmt against code
mod:
go mod tidy && go mod verify && \
buf mod update api
go mod tidy && go mod verify

# Run go vet against code
vet:
go vet ./...

# Run linters
lint:
buf lint && \
golangci-lint run

# Run code generators
gen:
buf generate --template api/buf.gen.yaml

# Serve the docs website locally and auto on changes
dev-docs:
cd .web && yarn install && yarn dev
2 changes: 1 addition & 1 deletion aliases.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package connect
import (
"google.golang.org/genproto/googleapis/rpc/status"

pb "go.minekube.com/connect/internal/api/minekube/connect/v1alpha1"
pb "buf.build/gen/go/minekube/connect/protocolbuffers/go/minekube/connect/v1alpha1"
)

// Type alias to better support updating versions.
Expand Down
21 changes: 0 additions & 21 deletions api/buf.gen.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions api/buf.lock

This file was deleted.

10 changes: 0 additions & 10 deletions api/buf.yaml

This file was deleted.

142 changes: 0 additions & 142 deletions api/minekube/connect/v1alpha1/watch_service.proto

This file was deleted.

3 changes: 0 additions & 3 deletions buf.work.yaml

This file was deleted.

19 changes: 9 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module go.minekube.com/connect
go 1.17

require (
buf.build/gen/go/minekube/connect/protocolbuffers/go v1.30.0-20230517095325-052a0564f571.1
github.com/stretchr/testify v1.8.1
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.29.1
nhooyr.io/websocket v1.8.7
)

Expand All @@ -15,16 +15,15 @@ require (
github.com/gobwas/ws v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/klauspost/compress v1.14.4 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/text v0.8.0 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
github.com/rogpeppe/go-internal v1.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 336108b

Please sign in to comment.