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.

Sign up for GitHub

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

Fix cannot find file when exec build in test/plugins #211

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix cannot find file when exec build in test/plugins #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Release Notes.
#### Bug Fixes
* Fix wrong docker image name and `-version` command.
* Fix redis plugin cannot work in cluster mode.
* Fix cannot find file when exec build in test/plugins.

#### Issues and PR
- All issues are [here](https://github.com/apache/skywalking/milestone/219?closed=1)
Expand Down
8 changes: 7 additions & 1 deletion test/plugins/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,18 @@
GO = go
GO_BUILD = $(GO) build

GIT_VERSION := $(shell git rev-parse --short HEAD)
ifeq ($(strip $(GIT_VERSION)),)
GIT_VERSION = $(shell grep gitCommit $(VERSION_FILE) | awk -F ': ' '{print $$2}')
endif
VERSION ?= $(GIT_VERSION)

.PHONY: build
build:
mkdir -p dist
# go agent
@make -C ../../tools/go-agent linux
cp ../../bin/skywalking-go-agent--linux-$(shell go env GOARCH) dist/skywalking-go-agent
cp ../../bin/skywalking-go-agent-$(VERSION)-linux-$(shell go env GOARCH) dist/skywalking-go-agent
# runner helper
cd runner-helper && $(GO_BUILD) -o ../dist/runner-helper
# validator container
Expand Down
3 changes: 3 additions & 0 deletions tools/go-agent/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ ifeq ($(strip $(GIT_COMMIT)),)
GIT_COMMIT = $(shell grep gitCommit $(VERSION_PATH) | awk -F ': ' '{print $$2}')
endif
VERSION ?= $(shell grep version $(VERSION_PATH) | awk -F ': ' '{print $$2}')
ifeq ($(strip $(VERSION)),)
VERSION = $(GIT_COMMIT)
endif

GO_VERSION := $(shell $(GO) env GOVERSION)
VERSION_PACKAGE := main
Expand Down
Loading