Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove server+relay+tunnel options #101

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .github/workflows/documentation.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pr_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
configDirectory: ./
- uses: actions/setup-go@v3
with:
go-version: '~1.17'
go-version: '~1.21'
- name: Compile protos
run: |
make setup/linux
Expand Down
23 changes: 1 addition & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ setup/linux:
go get -u github.com/golang/protobuf/protoc-gen-go

# protoc-go-inject-tag
go get github.com/favadi/protoc-go-inject-tag
go install github.com/favadi/protoc-go-inject-tag@latest

.PHONY: generate/all
generate/all: description = Compile protos for all languages
Expand Down Expand Up @@ -75,7 +75,6 @@ generate/ts:
-p ./protos/encoding \
-p ./protos/records \
-o ./build/ts/plumber-schemas.js \
./protos/*.proto \
./protos/**/*.proto
./node_modules/.bin/pbts -o ./build/ts/plumber-schemas.d.ts ./build/ts/plumber-schemas.js

Expand All @@ -91,23 +90,6 @@ generate/go:
mkdir -p $(GO_PROTOS_DIR)/opts
mkdir -p $(GO_PROTOS_DIR)/records

docker run --platform linux/amd64 -w $(PWD) -v $(PWD):/defs namely/protoc-all:1.51_1 \
-d /defs/protos \
-l descriptor_set \
--go-source-relative \
-o /defs/build/go/descriptor-sets/ \
--descr-include-imports \
--descr-include-source-info \
--descr-filename protos.fds \
protos/*.proto

docker run --platform linux/amd64 --rm -w $(PWD) -v $(PWD):/defs -w${PWD} namely/protoc-all:1.51_1 \
-d /defs/protos \
--go-source-relative \
-o /defs/build/go/protos \
-l go \
protos/*.proto

docker run --platform linux/amd64 --rm -w $(PWD) -v $(PWD):/defs -w${PWD} namely/protoc-all:1.51_1 \
-d /defs/protos/args \
--go-source-relative \
Expand Down Expand Up @@ -151,8 +133,6 @@ generate/go:
# Running code generation tasks
go run generate-type-aliases.go
go run generate-conn-opts-func.go
go run generate-merge-relay-opts.go
go run generate-merge-tunnel-opts.go

.PHONY: inject-tags/local
inject-tags/local: description = Inject tags for CLI
Expand All @@ -175,7 +155,6 @@ ifdef CI
endif

# Injecting tags into *.pb.go files...
protoc-go-inject-tag -input="$(GO_PROTOS_DIR)/*.pb.go"
protoc-go-inject-tag -input="$(GO_PROTOS_DIR)/args/*.pb.go"
protoc-go-inject-tag -input="$(GO_PROTOS_DIR)/common/*.pb.go"
protoc-go-inject-tag -input="$(GO_PROTOS_DIR)/encoding/*.pb.go"
Expand Down
Binary file removed build/go/descriptor-sets/protos.fds
Binary file not shown.
176 changes: 88 additions & 88 deletions build/go/protos/opts/batch_connection_options.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading