File tree Expand file tree Collapse file tree 3 files changed +22
-12
lines changed
Expand file tree Collapse file tree 3 files changed +22
-12
lines changed Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ jobs:
108108
109109 release-build-darwin :
110110 name : Release Build (darwin)
111- runs-on : macos-latest
111+ runs-on : macos-14
112112 needs : generate
113113 steps :
114114 - name : Check out code
@@ -124,7 +124,9 @@ jobs:
124124 go-version : ${{ steps.go_version.outputs.go_version }}
125125
126126 - name : Build Darwin
127- run : make ci-build-darwin ci-build-darwin-arm64-static
127+ run : |
128+ make ci-build-darwin GOARCH=amd64
129+ make ci-build-darwin-arm64-static
128130 timeout-minutes : 30
129131 env :
130132 TELEMETRY_URL : ${{ secrets.TELEMETRY_URL }}
Original file line number Diff line number Diff line change 4848
4949 release-build-darwin :
5050 name : Release Build (darwin)
51- runs-on : macos-latest
51+ runs-on : macos-14
5252 needs : generate
5353 steps :
5454 - name : Check out code
6464 go-version : ${{ steps.go_version.outputs.go_version }}
6565
6666 - name : Build Darwin
67- run : make ci-build-darwin ci-build-darwin-arm64-static
67+ run : |
68+ make ci-build-darwin GOARCH=amd64
69+ make ci-build-darwin-arm64-static
6870 timeout-minutes : 30
6971 env :
7072 TELEMETRY_URL : ${{ secrets.TELEMETRY_URL }}
Original file line number Diff line number Diff line change @@ -55,13 +55,14 @@ jobs:
5555 run : ubuntu-22.04
5656 targets : ci-go-ci-build-windows
5757 arch : amd64
58- # Note(philipc): The underlying make targets also build arm64_static,
59- # but the downstream targets only want the amd64 binaries, so amd64 is
60- # the artifact name we upload the darwin target to.
6158 - os : darwin
62- run : macos-latest
63- targets : ci-build-darwin ci-build-darwin-arm64-static
59+ run : macos-13
60+ targets : ci-build-darwin
6461 arch : amd64
62+ - os : darwin
63+ run : macos-14
64+ targets : ci-build-darwin-arm64-static
65+ arch : arm64
6566 steps :
6667 - name : Check out code
6768 uses : actions/checkout@v4
@@ -112,7 +113,7 @@ jobs:
112113 - os : linux
113114 run : ubuntu-22.04
114115 - os : darwin
115- run : macos-latest
116+ run : macos-14
116117 steps :
117118 - name : Check out code
118119 uses : actions/checkout@v4
@@ -282,9 +283,14 @@ jobs:
282283 arch : amd64
283284 wasm : disabled
284285 - os : darwin
285- run : macos-latest
286+ run : macos-13
286287 exec : opa_darwin_amd64
287288 arch : amd64
289+ - os : darwin
290+ run : macos-14
291+ exec : opa_darwin_arm64_static
292+ arch : arm64
293+ wasm : disabled
288294 - os : windows
289295 run : windows-latest
290296 exec : opa_windows_amd64.exe
@@ -314,7 +320,7 @@ jobs:
314320 strategy :
315321 fail-fast : false
316322 matrix :
317- os : [ubuntu-22.04, macos-latest ]
323+ os : [ubuntu-22.04, macos-14 ]
318324 version : ["1.20"]
319325 steps :
320326 - uses : actions/checkout@v4
You can’t perform that action at this time.
0 commit comments