Skip to content

Commit 594736b

Browse files
authored
Merge pull request #1324 from mackerelio/fix-tarball-version
fix tarball version
2 parents 40d3e7f + c8e4f1b commit 594736b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ rpm-v2-arm:
7575
--define "buildarch aarch64" --define "dist .amzn2" \
7676
--target aarch64 -bb packaging/rpm/mackerel-agent-plugins-v2.spec
7777

78+
NEXT_VERSION := $(shell grep -o -e "[0-9]\+.[0-9]\+.[0-9]\+-[0-9]" "packaging/deb-v2/debian/changelog" | head -1 | sed 's/-.*$$//')
79+
7880
.PHONY: deb
7981
deb: deb-v2-x86 deb-v2-arm
8082

@@ -83,15 +85,15 @@ deb-v2-x86:
8385
git clean -f -d ./packaging
8486
$(MAKE) build/mackerel-plugin GOOS=linux GOARCH=amd64
8587
cp build/mackerel-plugin packaging/deb-v2/debian/
86-
cp -f packaging/dummy-empty.tar.gz packaging/mackerel-agent-plugins_${VERSION}.orig.tar.gz
88+
cp -f packaging/dummy-empty.tar.gz packaging/mackerel-agent-plugins_${NEXT_VERSION}.orig.tar.gz
8789
cd packaging/deb-v2 && debuild --no-tgz-check -rfakeroot -uc -us
8890

8991
.PHONY: deb-v2-arm
9092
deb-v2-arm:
9193
git clean -f -d ./packaging
9294
$(MAKE) build/mackerel-plugin GOOS=linux GOARCH=arm64
9395
cp build/mackerel-plugin packaging/deb-v2/debian/
94-
cp -f packaging/dummy-empty.tar.gz packaging/mackerel-agent-plugins_${VERSION}.orig.tar.gz
96+
cp -f packaging/dummy-empty.tar.gz packaging/mackerel-agent-plugins_${NEXT_VERSION}.orig.tar.gz
9597
cd packaging/deb-v2 && debuild --no-tgz-check -rfakeroot -uc -us -aarm64
9698

9799
.PHONY: tar

0 commit comments

Comments
 (0)