Skip to content

Commit 2b23c59

Browse files
authored
Migrate to new vanity import URLs (temporalio#517)
1 parent 37f1b77 commit 2b23c59

File tree

371 files changed

+2248
-2245
lines changed

Some content is hidden

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

371 files changed

+2248
-2245
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "proto/temporal-proto"]
2-
path = proto/temporal-proto
3-
url = git@github.com:temporalio/temporal-proto.git
1+
[submodule "proto/api"]
2+
path = proto/api
3+
url = https://github.com/temporalio/api

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ clean: clean-bins clean-test-results
1515
proto: clean-proto install-proto-submodule protoc fix-proto-path proto-mock goimports-proto
1616

1717
# Update proto submodule from remote and recompile proto files.
18-
update-proto: clean-proto update-proto-submodule protoc fix-proto-path update-proto-go proto-mock goimports-proto gomodtidy
18+
update-proto: clean-proto update-proto-submodule protoc fix-proto-path update-go-api proto-mock goimports-proto gomodtidy
1919

2020
# Build all docker images.
2121
docker-images:
@@ -81,7 +81,7 @@ endif
8181

8282
PROTO_ROOT := proto
8383
PROTO_DIRS = $(sort $(dir $(shell find $(PROTO_ROOT)/internal -name "*.proto")))
84-
PROTO_IMPORT := $(PROTO_ROOT)/internal:$(PROTO_ROOT)/temporal-proto:$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
84+
PROTO_IMPORT := $(PROTO_ROOT)/internal:$(PROTO_ROOT)/api:$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
8585
PROTO_OUT := api
8686

8787
ALL_SRC := $(shell find . -name "*.go" | grep -v -e "^$(PROTO_OUT)")
@@ -137,11 +137,11 @@ clean-proto:
137137

138138
update-proto-submodule:
139139
@printf $(COLOR) "Update proto submodule from remote..."
140-
git submodule update --force --remote $(PROTO_ROOT)/temporal-proto
140+
git submodule update --force --remote $(PROTO_ROOT)/api
141141

142142
install-proto-submodule:
143143
@printf $(COLOR) "Install proto submodule..."
144-
git submodule update --init $(PROTO_ROOT)/temporal-proto
144+
git submodule update --init $(PROTO_ROOT)/api
145145

146146
protoc: $(PROTO_OUT)
147147
@printf $(COLOR) "Build proto files..."
@@ -160,9 +160,9 @@ proto-mock: $(PROTO_OUT)
160160
@printf $(COLOR) "Generate proto mocks..."
161161
$(foreach PROTO_GRPC_SERVICE,$(PROTO_GRPC_SERVICES),cd $(PROTO_OUT) && mockgen -package $(call service_name,$(PROTO_GRPC_SERVICE))mock -source $(PROTO_GRPC_SERVICE) -destination $(call mock_file_name,$(PROTO_GRPC_SERVICE))$(NEWLINE) )
162162

163-
update-proto-go:
164-
@printf $(COLOR) "Update go.temporal.io/temporal-proto..."
165-
@go get -u go.temporal.io/temporal-proto
163+
update-go-api:
164+
@printf $(COLOR) "Update go.temporal.io/api..."
165+
@go get -u go.temporal.io/api
166166

167167
goimports-proto:
168168
@printf $(COLOR) "Run goimports..."

api/adminservice/v1/request_response.pb.go

Lines changed: 124 additions & 124 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/archiver/v1/message.pb.go

Lines changed: 53 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)