diff --git a/.github/workflows/build-and-test-pkg.yaml b/.github/workflows/build-and-test-pkg.yaml index c1b515fb5..79e6e3852 100644 --- a/.github/workflows/build-and-test-pkg.yaml +++ b/.github/workflows/build-and-test-pkg.yaml @@ -38,7 +38,7 @@ jobs: macos-aarch64-pkg-build: needs: get-tag-name - runs-on: [self-hosted, macos, arm64, 11, release] + runs-on: [self-hosted, macos, arm64, 14, release] timeout-minutes: 60 steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 @@ -75,7 +75,7 @@ jobs: macos-x86-64-pkg-build: needs: get-tag-name - runs-on: [self-hosted, macos, amd64, 11, release] + runs-on: [self-hosted, macos, amd64, 14, release] timeout-minutes: 60 steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 diff --git a/.github/workflows/upload-build-to-S3.yaml b/.github/workflows/upload-build-to-S3.yaml index 22d041864..bbc8a5b07 100644 --- a/.github/workflows/upload-build-to-S3.yaml +++ b/.github/workflows/upload-build-to-S3.yaml @@ -13,7 +13,7 @@ permissions: jobs: macos-aarch64-build: - runs-on: [self-hosted, macos, arm64, 11, release] + runs-on: [self-hosted, macos, arm64, 14, release] timeout-minutes: 60 steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 @@ -42,7 +42,7 @@ jobs: if-no-files-found: error macos-x86_64-build: - runs-on: [self-hosted, macos, amd64, 11, release] + runs-on: [self-hosted, macos, amd64, 14, release] timeout-minutes: 60 steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 diff --git a/Makefile b/Makefile index f69ab1b60..14e0dc1c3 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ LICENSEDIR := $(OUTDIR)/license-files VERSION := $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags) GITCOMMIT := $(shell git rev-parse HEAD)$(shell test -z "$(git status --porcelain)" || echo .m) LDFLAGS := "-X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.GitCommit=$(GITCOMMIT)" +MIN_MACOS_VERSION ?= 11.0 GOOS ?= $(shell $(GO) env GOOS) ifeq ($(GOOS),windows) @@ -203,6 +204,8 @@ uninstall: uninstall.finch .PHONY: finch ifeq ($(GOOS),windows) finch: finch-windows finch-general +else ifeq ($(GOOS),darwin) +finch: finch-macos else finch: finch-unix endif @@ -211,6 +214,10 @@ finch-windows: GOBIN=$(GOBIN) go install github.com/tc-hib/go-winres $(GO) generate cmd/finch/main_windows.go +finch-macos: export CGO_CFLAGS := -mmacosx-version-min=$(MIN_MACOS_VERSION) +finch-macos: export CGO_LDFLAGS := -mmacosx-version-min=$(MIN_MACOS_VERSION) +finch-macos: finch-unix + finch-unix: finch-general finch-general: