From 63db5642fa43928a14140d4386f4049fb2797ef4 Mon Sep 17 00:00:00 2001
From: RebeccaMahany <rebeccamahany@gmail.com>
Date: Thu, 17 Oct 2024 09:16:38 -0400
Subject: [PATCH 1/3] Remove macos-12 runner since it will be deprecated soon;
 begin using macos-15 runner

---
 .github/workflows/go.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 57ea8a1f8..2698b86a1 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-12
+          - macos-13
           - windows-latest
     steps:
     - name: Check out code
@@ -130,9 +130,9 @@ jobs:
           # See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
           - ubuntu-20.04
           - ubuntu-22.04
-          - macos-12
           - macos-13
           - macos-14
+          - macos-15
           - windows-2019
           - windows-2022
     needs: version_baseline
@@ -207,7 +207,7 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-12
+          - macos-13
           - windows-latest
     steps:
     - uses: actions/checkout@v4

From a10db3da4eb8d187a1e48b364b11b93927aa5196 Mon Sep 17 00:00:00 2001
From: RebeccaMahany <rebeccamahany@gmail.com>
Date: Thu, 17 Oct 2024 09:29:40 -0400
Subject: [PATCH 2/3] Don't warn on duplicate lobjc library

---
 pkg/make/builder.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/make/builder.go b/pkg/make/builder.go
index ab86c9d90..725bcaa57 100644
--- a/pkg/make/builder.go
+++ b/pkg/make/builder.go
@@ -307,6 +307,11 @@ func (b *Builder) BuildCmd(src, appName string) func(context.Context) error {
 			ldFlags = append(ldFlags, "-H windowsgui")
 		}
 
+		if b.os == "darwin" {
+			// Suppress warnings like "ld: warning: ignoring duplicate libraries: '-lobjc'"
+			ldFlags = append(ldFlags, "-extldflags=-Wl,-no_warn_duplicate_libraries")
+		}
+
 		if b.stampVersion {
 			v, err := b.getVersion(ctx)
 			if err != nil {

From 0f743fb11b098dc0b3b70c5283236ebdd74c22fe Mon Sep 17 00:00:00 2001
From: RebeccaMahany <rebeccamahany@gmail.com>
Date: Thu, 17 Oct 2024 09:53:37 -0400
Subject: [PATCH 3/3] Link to golang issue

---
 pkg/make/builder.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/make/builder.go b/pkg/make/builder.go
index 725bcaa57..9a45bb1ab 100644
--- a/pkg/make/builder.go
+++ b/pkg/make/builder.go
@@ -309,6 +309,7 @@ func (b *Builder) BuildCmd(src, appName string) func(context.Context) error {
 
 		if b.os == "darwin" {
 			// Suppress warnings like "ld: warning: ignoring duplicate libraries: '-lobjc'"
+			// See: https://github.com/golang/go/issues/67799
 			ldFlags = append(ldFlags, "-extldflags=-Wl,-no_warn_duplicate_libraries")
 		}