Merge pull request #915 from mackerelio/remove-rewrite-some-files-on-every-releases

Remove rewrite some files on every releases

Author: yseto

.github/workflows/create-release-pr.yml

@@ -24,11 +24,7 @@ jobs:
           next_version: ${{ github.event.inputs.release_version }}
           package_name: mackerel-check-plugins
           version_go_file_path: mackerel-check.go
-
-      - run: |
-          CURRENT=${{ steps.start.outputs.currentVersion }}
-          NEXT=${{ steps.start.outputs.nextVersion }}
-          mv packaging/mackerel-check-plugins_$CURRENT.orig.tar.gz packaging/mackerel-check-plugins_$NEXT.orig.tar.gz
+          ignore_update_program_files: "true"
 
       - uses: mackerelio/mackerel-create-release-pull-request-action@main
         with:

.github/workflows/test.yml

@@ -55,6 +55,8 @@ jobs:
         with:
           go-version: 1.23.x
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - run: make clean build rpm deb
       - uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -6,3 +6,4 @@
 !.travis.yml
 /build
 check-*/check-*
+packaging/*.deb

Makefile

@@ -1,5 +1,5 @@
-VERSION = 0.48.0
-CURRENT_REVISION = $(shell git rev-parse --short HEAD)
+# This VERSION variable indicates the latest tag.
+VERSION = $(subst v,,$(shell git describe --abbrev=0 --tags))
 ifeq ($(OS),Windows_NT)
 GOPATH_ROOT:=$(shell cygpath ${GOPATH})
 else
@@ -40,7 +40,7 @@ build:
 # We need to force rebuild "mackerel-check" if GOOS or GOARCH are passed.
 build/mackerel-check: $(patsubst %,depends_on,$(GOOS)$(GOARCH))
 	mkdir -p build
-	CGO_ENABLED=0 go build -ldflags="-s -w -X main.gitcommit=$(CURRENT_REVISION)" \
+	CGO_ENABLED=0 go build -ldflags="-s -w" \
 	  -o build/mackerel-check
 
 .PHONY: depends_on
@@ -78,14 +78,18 @@ deb: deb-v2-x86 deb-v2-arm
 
 .PHONY: deb-v2-x86
 deb-v2-x86:
+	git clean -f -d ./packaging
 	make build/mackerel-check GOOS=linux GOARCH=amd64
 	cp build/mackerel-check packaging/deb-v2/debian/
+	cp -f packaging/dummy-empty.tar.gz packaging/mackerel-check-plugins_${VERSION}.orig.tar.gz
 	cd packaging/deb-v2 && debuild --no-tgz-check -rfakeroot -uc -us
 
 .PHONY: deb-v2-arm
 deb-v2-arm:
+	git clean -f -d ./packaging
 	make build/mackerel-check GOOS=linux GOARCH=arm64
 	cp build/mackerel-check packaging/deb-v2/debian/
+	cp -f packaging/dummy-empty.tar.gz packaging/mackerel-check-plugins_${VERSION}.orig.tar.gz
 	cd packaging/deb-v2 && debuild --no-tgz-check -rfakeroot -uc -us -aarm64
 
 .PHONY: clean

mackerel-check.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"runtime/debug"
 	"strings"
 )
 
@@ -60,11 +61,25 @@ func run(args []string) int {
 	return exitOK
 }
 
-const version = "0.48.0"
-
-var gitcommit string
+func fromVCS() (version, rev string) {
+	version = "unknown"
+	rev = "unknown"
+	info, ok := debug.ReadBuildInfo()
+	if !ok {
+		return
+	}
+	version = info.Main.Version
+	for _, s := range info.Settings {
+		if s.Key == "vcs.revision" {
+			rev = s.Value
+			return
+		}
+	}
+	return
+}
 
 func printHelp() {
+	version, gitcommit := fromVCS()
 	fmt.Printf(`mackerel-check %s (rev %s) [%s %s %s]
 
 Usage: mackerel-check <plugin> [<args>]