You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/01/20 12:27:09 UTC
[skywalking-satellite] branch chore/check-diff created (now e519805)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch chore/check-diff
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git.
at e519805 Include go.sum|go.mod in CI consistency
This branch includes the following new commits:
new e519805 Include go.sum|go.mod in CI consistency
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: Include go.sum|go.mod in CI
consistency
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch chore/check-diff
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
commit e519805e85abb2f3a831a411ee46950724376c17
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Jan 20 20:26:07 2021 +0800
Include go.sum|go.mod in CI consistency
---
Makefile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 95bf1a7..be99fd4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ BINARY = skywalking-satellite
RELEASE_BIN = skywalking-satellite-$(VERSION)-bin
RELEASE_SRC = skywalking-satellite-$(VERSION)-src
-OS = $(shell uname)
+OSNAME := $(if $(findstring Darwin,$(shell uname)),darwin,linux)
SH = sh
GO = go
@@ -84,13 +84,12 @@ clean: tools
build: deps linux darwin
.PHONY: check
-check:
- $(MAKE) clean
- $(OUT_DIR)/skywalking-satellite-latest-linux-amd64 docs
+check: clean
+ $(OUT_DIR)/$(BINARY)-$(VERSION)-$(OSNAME)-$(ARCH) docs
$(GO) mod tidy &> /dev/null
- @if [ ! -z "`git status -s |grep -v 'go.mod\|go.sum'`" ]; then \
+ @if ! git status -s; then \
echo "Following files are not consistent with CI:"; \
- git status -s |grep -v 'go.mod\|go.sum'; \
+ git status -s \
exit 1; \
fi