From 7872177381d1d7d4868ddbfb4d7ffc5ffd77b389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 24 May 2023 18:47:08 +0100
Subject: [PATCH] CI: try macos-latest again

And bump go-internal to its latest version, to include its fix
for those pesky "signal: killed" failures on macos.

While here, run the tests with -short on GOARCH=386,
and make our use of actions/setup-go a bit more consistent.
---
 .github/workflows/test.yml | 18 ++++++++----------
 go.mod                     |  3 ++-
 go.sum                     |  5 +++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3bb5b54..866076f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,8 +26,7 @@ jobs:
     strategy:
       matrix:
         go-version: [1.20.x]
-        # TODO: revert to macos-latest once we figure out https://github.com/burrowers/garble/issues/609.
-        os: [ubuntu-latest, macos-11, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -70,7 +69,7 @@ jobs:
         version: "2023.1.3"
         install-go: false
 
-  # We don't care about GOARCH=386 particularly,
+  # We don't care about GOARCH=386 particularly, hence -short,
   # but it helps ensure we support 32-bit hosts and targets well.
   # TODO: use CGO_ENABLED=1 once we figure out how to install gcc-multilib,
   # and once gotooltest forwards the value of CGO_ENABLED to the scripts.
@@ -79,16 +78,17 @@ jobs:
     env:
       GOARCH: 386
     steps:
-    - uses: actions/setup-go@v3
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v4
       with:
         go-version: 1.20.x
-    - uses: actions/checkout@v3
-    - name: Test
-      run: go test -timeout=15m ./...
+        cache: false
+    - run: go test -short ./...
 
   test-gotip:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v3
     - name: Install Go
       env:
         GO_COMMIT: aeb0644bd33e67f24e2411a651ac9ff72ddc96b4 # 2023-05-19
@@ -105,6 +105,4 @@ jobs:
         ./make.bash
         echo "GOROOT=$HOME/gotip" >>$GITHUB_ENV
         echo "$HOME/gotip/bin" >>$GITHUB_PATH
-    - uses: actions/checkout@v3
-    - name: Test
-      run: go test -timeout=15m ./...
+    - run: go test -timeout=15m ./...
diff --git a/go.mod b/go.mod
index e791772..2ffb5a1 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/bluekeyes/go-gitdiff v0.7.1
 	github.com/frankban/quicktest v1.14.5
 	github.com/google/go-cmp v0.5.9
-	github.com/rogpeppe/go-internal v1.10.0
+	github.com/rogpeppe/go-internal v1.10.1-0.20230523133328-2d7bba0e58db
 	golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
 	golang.org/x/mod v0.10.0
 	golang.org/x/tools v0.8.0
@@ -15,4 +15,5 @@ require (
 require (
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 9808f87..7dc1dc4 100644
--- a/go.sum
+++ b/go.sum
@@ -11,12 +11,13 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/rogpeppe/go-internal v1.10.1-0.20230523133328-2d7bba0e58db h1:/cdA6+LK/ZRFD95u1W5f1KiheGgApBOWSRRpkS78wwo=
+github.com/rogpeppe/go-internal v1.10.1-0.20230523133328-2d7bba0e58db/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o=
 golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
 golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=