Skip to content

Commit

Permalink
Fix cannot find file when exec build in test/plugins (#211)
Browse files Browse the repository at this point in the history
  • Loading branch information
CodePrometheus authored Dec 16, 2024
1 parent 3981a26 commit f989faf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
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
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
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

0 comments on commit f989faf

Please sign in to comment.