From e68ebf1879f7a26aa3b99b1b0a751e91c6b08a29 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Tue, 12 Nov 2024 17:01:25 +0900 Subject: [PATCH 1/5] =?UTF-8?q?build=20=E5=89=8D=E3=81=AB=20patch=20?= =?UTF-8?q?=E3=82=92=E3=81=82=E3=81=A6=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b6d3f2..83b959d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,9 @@ jobs: - run: go install github.com/tcnksm/ghr@latest + - name: Patch + run: make patch + - name: Build run: | CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o dist/suzu_linux_amd64 cmd/suzu/main.go From bfd9f086f87f35ff63fb302fdfb811c057a496b1 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Tue, 12 Nov 2024 17:03:58 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index b7f0741..8def1ec 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +- [FIX] リリース時の build 前に patch をあてるように修正する + ### misc ## 2024.5.0 From be60ff85fe2db118ec5d11bac6d76d602ae77e29 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Tue, 12 Nov 2024 17:09:50 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8def1ec..85caee4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,10 +11,13 @@ ## develop -- [FIX] リリース時の build 前に patch をあてるように修正する - ### misc +## 2024.5.1 + +- [FIX] リリース時の build 前に patch をあてるように修正する + - @Hexa + ## 2024.5.0 - [FIX] 高ビットレートの音声データの場合に、解析結果が送られてこない不具合を修正する From e0dedbb585ef5bfcc09bed9d95ff4c0e9ea3267f Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Tue, 12 Nov 2024 17:11:05 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0cf8b76..b150c16 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2024.5.0 +2024.5.1 From 524a2a1a5ab0b32be26beb08214fdf5a0211b022 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Wed, 13 Nov 2024 11:30:34 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E6=99=82=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89=E3=82=92=20Makefi?= =?UTF-8?q?le=20=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 +++--- CHANGES.md | 2 ++ Makefile | 10 ++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83b959d..6ef3f33 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,9 +23,9 @@ jobs: - name: Build run: | - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o dist/suzu_linux_amd64 cmd/suzu/main.go - CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o dist/suzu_darwin_amd64 cmd/suzu/main.go - CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o dist/suzu_darwin_arm64 cmd/suzu/main.go + GOOS=linux GOARCH=amd64 make release + GOOS=darwin GOARCH=amd64 make release + GOOS=darwin GOARCH=arm64 make release gzip dist/* - name: Release diff --git a/CHANGES.md b/CHANGES.md index 85caee4..eb4e508 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,8 @@ - [FIX] リリース時の build 前に patch をあてるように修正する - @Hexa +- [ADD] リリース時の build を Makefile にまとめる + - @Hexa ## 2024.5.0 diff --git a/Makefile b/Makefile index 4a92547..532ebc0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ .PHONY: all patch test +LIST := $(GOOS) $(GOARCH) +SUFFIX := $(shell printf "_%s" $(LIST)) + all: patch go build -o bin/suzu cmd/suzu/main.go @@ -10,3 +13,10 @@ patch: test: @go test -v --race + +release: patch +ifeq ($(SUFFIX),_) + CGO_ENABLED=0 go build -o dist/suzu cmd/suzu/main.go +else + CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o dist/suzu$(SUFFIX) cmd/suzu/main.go +endif \ No newline at end of file