From 8331ad014fe0d1439a56b86694c6bb39962736c4 Mon Sep 17 00:00:00 2001 From: Antonis Kalipetis Date: Wed, 7 Jan 2026 12:35:48 +0200 Subject: [PATCH 1/2] fix: Makefile now correctly selects the build ID for macos --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 76aa6d45..5f210537 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,5 @@ PHP_VERSION = 8.4.16 -GORELEASER_ID ?= upsun - -ifeq ($(GOOS), darwin) - GORELEASER_ID=$(GORELEASER_ID)-macos -endif - GOOS := $(shell uname -s | tr '[:upper:]' '[:lower:]') GOARCH := $(shell uname -m) ifeq ($(GOARCH), x86_64) @@ -15,6 +9,12 @@ ifeq ($(GOARCH), aarch64) GOARCH=arm64 endif +GORELEASER_ID ?= upsun + +ifeq ($(GOOS), darwin) + GORELEASER_ID := $(GORELEASER_ID)-macos +endif + VERSION := $(shell git describe --always) # Tooling versions From 7476d78b0a32d87721096e5479092ae413057630 Mon Sep 17 00:00:00 2001 From: Antonis Kalipetis Date: Tue, 20 Jan 2026 16:12:41 +0200 Subject: [PATCH 2/2] feat(make): better handle defaults and overrides for GORELEASER_ID using FLAVOR --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5f210537..5ec1ba1f 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,12 @@ ifeq ($(GOARCH), aarch64) GOARCH=arm64 endif -GORELEASER_ID ?= upsun +FLAVOR ?= upsun ifeq ($(GOOS), darwin) - GORELEASER_ID := $(GORELEASER_ID)-macos + GORELEASER_ID = $(FLAVOR)-macos +else + GORELEASER_ID = $(FLAVOR) endif VERSION := $(shell git describe --always)