You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by li...@apache.org on 2021/06/03 05:55:01 UTC

[skywalking-satellite] branch change-api-package created (now 64c487c)

This is an automated email from the ASF dual-hosted git repository.

liujiapeng pushed a change to branch change-api-package
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git.


      at 64c487c  change go api package

This branch includes the following new commits:

     new 64c487c  change go api package

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[skywalking-satellite] 01/01: change go api package

Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

liujiapeng pushed a commit to branch change-api-package
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git

commit 64c487c5b4b3b2992b37959359e653def8617fcb
Author: Evan <31...@users.noreply.github.com>
AuthorDate: Thu Jun 3 13:52:49 2021 +0800

    change go api package
---
 .github/workflows/build-and-test.yaml                       |  2 +-
 Makefile                                                    | 13 ++-----------
 .../satellite-protocol/{event => satellite}/Event.proto     |  3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 26b5d80..4e0abee 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -55,7 +55,7 @@ jobs:
         run: make build
       - name: Check CI Consistency
         if: matrix.go-version == '1.15' && matrix.runner == 'ubuntu'
-        run: make gen-docs && make check
+        run: make check
       - name: Build Docker
         if: matrix.runner == 'ubuntu'
         run: make docker
diff --git a/Makefile b/Makefile
index 6902866..cbbf9c9 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ARCH = amd64
 
 SHELL = /bin/bash
 
-all: deps verify build gen-docs check
+all: deps verify build check
 
 .PHONY: tools
 tools:
@@ -54,15 +54,6 @@ tools:
 deps: tools
 	$(GO_GET) -v -t -d ./...
 
-.PHONY: gen-codes
-gen-codes:
-	$(PROTOC) --version || sh tools/install_protoc.sh
-	/bin/sh tools/protocol_gen.sh
-
-.PHONY: gen-docs
-gen-docs: build
-	rm -rf $(PLUGIN_DOC_DIR)
-	$(OUT_DIR)/$(BINARY)-$(VERSION)-$(OSNAME)-$(ARCH) docs --output=$(PLUGIN_DOC_DIR)
 
 .PHONY: lint
 lint: tools
@@ -80,7 +71,7 @@ clean: tools
 	-rm -rf coverage.txt
 
 .PHONY: build
-build: clean gen-codes deps linux darwin windows
+build: clean deps linux darwin windows
 
 .PHONY: check
 check: clean
diff --git a/protocol/satellite-protocol/event/Event.proto b/protocol/satellite-protocol/satellite/Event.proto
similarity index 96%
rename from protocol/satellite-protocol/event/Event.proto
rename to protocol/satellite-protocol/satellite/Event.proto
index 69efbbc..34a8592 100644
--- a/protocol/satellite-protocol/event/Event.proto
+++ b/protocol/satellite-protocol/satellite/Event.proto
@@ -20,8 +20,7 @@ syntax = "proto3";
 
 package skywalking.v3;
 
-option go_package = "satellite/protocol";
-
+option go_package = "skywalking.apache.org/repo/goapi/satellite/event/v1";
 
 import "language-agent/CLRMetric.proto";
 import "language-agent/JVMMetric.proto";