From b4cd2273d857208ff3be0d469da2563985fd188c Mon Sep 17 00:00:00 2001
From: William Martin <williammartin@github.com>
Date: Tue, 17 Jun 2025 11:13:03 +0200
Subject: [PATCH 1/2] Bump to Go 1.24

---
 go.mod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 66383962f99..238a06eb102 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/cli/cli/v2
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.5
+toolchain go1.24.4
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7

From 49ed6c46810bc4d62dbe89ba48e0cd2964fc6324 Mon Sep 17 00:00:00 2001
From: William Martin <williammartin@github.com>
Date: Tue, 17 Jun 2025 11:13:45 +0200
Subject: [PATCH 2/2] Use t.Chdir in tests

---
 pkg/cmd/extension/command_test.go         |  7 +++---
 pkg/cmd/extension/manager_test.go         | 27 ++++++++---------------
 pkg/cmd/release/download/download_test.go | 11 +--------
 pkg/cmdutil/args_test.go                  | 15 ++-----------
 4 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/pkg/cmd/extension/command_test.go b/pkg/cmd/extension/command_test.go
index 76741714aad..7001c8f1a7a 100644
--- a/pkg/cmd/extension/command_test.go
+++ b/pkg/cmd/extension/command_test.go
@@ -23,15 +23,14 @@ import (
 	"github.com/cli/cli/v2/pkg/iostreams"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewCmdExtension(t *testing.T) {
 	tempDir := t.TempDir()
-	oldWd, _ := os.Getwd()
 	localExtensionTempDir := filepath.Join(tempDir, "gh-hello")
-	assert.NoError(t, os.MkdirAll(localExtensionTempDir, 0755))
-	assert.NoError(t, os.Chdir(localExtensionTempDir))
-	t.Cleanup(func() { _ = os.Chdir(oldWd) })
+	require.NoError(t, os.MkdirAll(localExtensionTempDir, 0755))
+	t.Chdir(localExtensionTempDir)
 
 	tests := []struct {
 		name          string
diff --git a/pkg/cmd/extension/manager_test.go b/pkg/cmd/extension/manager_test.go
index 167af34393c..e933f0bdfab 100644
--- a/pkg/cmd/extension/manager_test.go
+++ b/pkg/cmd/extension/manager_test.go
@@ -1251,9 +1251,10 @@ func TestManager_repo_not_found(t *testing.T) {
 }
 
 func TestManager_Create(t *testing.T) {
-	chdirTemp(t)
+	tempDir := t.TempDir()
+	t.Chdir(tempDir)
 	err := os.MkdirAll("gh-test", 0755)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	ios, _, stdout, stderr := iostreams.Test()
 
@@ -1279,9 +1280,10 @@ func TestManager_Create(t *testing.T) {
 }
 
 func TestManager_Create_go_binary(t *testing.T) {
-	chdirTemp(t)
+	tempDir := t.TempDir()
+	t.Chdir(tempDir)
 	err := os.MkdirAll("gh-test", 0755)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	reg := httpmock.Registry{}
 	defer reg.Verify(t)
@@ -1329,9 +1331,10 @@ func TestManager_Create_go_binary(t *testing.T) {
 }
 
 func TestManager_Create_other_binary(t *testing.T) {
-	chdirTemp(t)
+	tempDir := t.TempDir()
+	t.Chdir(tempDir)
 	err := os.MkdirAll("gh-test", 0755)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	ios, _, stdout, stderr := iostreams.Test()
 
@@ -1392,18 +1395,6 @@ func Test_ensurePrefixed(t *testing.T) {
 	}
 }
 
-// chdirTemp changes the current working directory to a temporary directory for the duration of the test.
-func chdirTemp(t *testing.T) {
-	oldWd, _ := os.Getwd()
-	tempDir := t.TempDir()
-	if err := os.Chdir(tempDir); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		_ = os.Chdir(oldWd)
-	})
-}
-
 func fileNames(files []os.DirEntry) []string {
 	names := make([]string, len(files))
 	for i, f := range files {
diff --git a/pkg/cmd/release/download/download_test.go b/pkg/cmd/release/download/download_test.go
index 9337c9b6561..37c0e3c02fa 100644
--- a/pkg/cmd/release/download/download_test.go
+++ b/pkg/cmd/release/download/download_test.go
@@ -174,11 +174,6 @@ func Test_NewCmdDownload(t *testing.T) {
 }
 
 func Test_downloadRun(t *testing.T) {
-	oldwd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("could not determine working directory: %v", err)
-	}
-
 	tests := []struct {
 		name       string
 		isTTY      bool
@@ -526,11 +521,7 @@ func Test_downloadRun(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			tempDir := t.TempDir()
-			if err := os.Chdir(tempDir); err == nil {
-				t.Cleanup(func() { _ = os.Chdir(oldwd) })
-			} else {
-				t.Fatal(err)
-			}
+			t.Chdir(tempDir)
 
 			ios, _, stdout, stderr := iostreams.Test()
 			ios.SetStdoutTTY(tt.isTTY)
diff --git a/pkg/cmdutil/args_test.go b/pkg/cmdutil/args_test.go
index 4e880dd273f..58f0dc0b627 100644
--- a/pkg/cmdutil/args_test.go
+++ b/pkg/cmdutil/args_test.go
@@ -210,17 +210,10 @@ func createTestDir(t *testing.T) (cleanupFn func()) {
 	rootDir := t.TempDir()
 
 	// Move workspace to temporary directory
-	cwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.Chdir(rootDir)
-	if err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(rootDir)
 
 	// Make subdirectories
-	err = os.Mkdir(filepath.Join(rootDir, "subDir1"), 0755)
+	err := os.Mkdir(filepath.Join(rootDir, "subDir1"), 0755)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -253,10 +246,6 @@ func createTestDir(t *testing.T) (cleanupFn func()) {
 
 	cleanupFn = func() {
 		os.RemoveAll(rootDir)
-		err = os.Chdir(cwd)
-		if err != nil {
-			t.Fatal(err)
-		}
 	}
 	return cleanupFn
 }