Skip to content

ci: use make in PRs #276

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

Merged
merged 2 commits into from
Aug 14, 2022
Merged

ci: use make in PRs #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27de815
Makefile: tidy up
axw Aug 12, 2022
543c3bf
ci: use `make build` and `make NOTICE.txt`
axw Aug 12, 2022
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
8 changes: 4 additions & 4 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ pipeline {
}
}
withGithubNotify(context: "NOTICE.txt") {
dir("${BASE_DIR}"){
withGoEnv(){
withGoEnv(){
dir("${BASE_DIR}/apm-lambda-extension"){
sh(label: 'notice', script: '''
bash ./apm-lambda-extension/scripts/notice.sh
make NOTICE.txt
git diff --exit-code --quiet && exit 0 || echo "regenerate NOTICE.txt" && exit 1
''')
}
Expand All @@ -83,7 +83,7 @@ pipeline {
unstash 'source'
withGoEnv(){
dir("${BASE_DIR}/apm-lambda-extension"){
cmd(label: 'Go build', script: 'go build')
cmd(label: 'make build', script: 'make build')
}
}
}
Expand Down
13 changes: 8 additions & 5 deletions apm-lambda-extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ export AWS_FOLDER GOARCH ARCHITECTURE DOCKER_IMAGE_NAME DOCKER_REGISTRY
.PHONY: all
all: build

.PHONY: gen-notice
gen-notice:
NOTICE.txt: go.mod
@bash ./scripts/notice.sh

check-licenses:
Expand All @@ -44,7 +43,7 @@ lint:
go run github.com/golangci/golangci-lint/cmd/[email protected] version
go run github.com/golangci/golangci-lint/cmd/[email protected] run

build: check-licenses gen-notice
build: check-licenses NOTICE.txt
GOOS=linux go build -o bin/extensions/apm-lambda-extension main.go
cp NOTICE.txt bin/NOTICE.txt
cp dependencies.asciidoc bin/dependencies.asciidoc
Expand All @@ -59,17 +58,21 @@ endif
GOARCH=${GOARCH} make build
GOARCH=${GOARCH} make zip
$(MAKE) publish
zip:

zip: build
cd bin \
&& rm -f extension.zip \
&& find extensions NOTICE.txt dependencies.asciidoc | xargs touch -d @$(SOURCE_DATE_EPOCH) \
&& zip -X -r extension.zip extensions NOTICE.txt dependencies.asciidoc \
&& cp extension.zip ${GOARCH}.zip

test:
go test extension/*.go -v

env:
env
dist: validate-branch-name build test zip

dist: validate-branch-name test zip
@cp ./bin/$(GOARCH).zip bin/$(BRANCH_NAME)-linux-$(GOARCH).zip

build-docker: validate-version
Expand Down