Skip to content

Commit b125e36

Browse files
committed
Revert "CI: create separate artifacts for macos-{13,14,15}"
This reverts commit 76be8ba. Signed-off-by: Akihiro Suda <[email protected]>
1 parent 8eb855a commit b125e36

File tree

1 file changed

+4
-23
lines changed

1 file changed

+4
-23
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,13 @@ on:
1313
- 'master'
1414
env:
1515
GO111MODULE: on
16-
MACOS_LATEST_PRODUCT_VERSION: 15
1716
permissions:
1817
contents: read
1918

2019
jobs:
2120
artifacts-darwin:
2221
name: Artifacts Darwin
23-
runs-on: ${{ matrix.runner }}
24-
strategy:
25-
fail-fast: false
26-
matrix:
27-
# When you update this list, make sure to update MACOS_LATEST_PRODUCT_VERSION too
28-
runner: ["macos-13", "macos-14", "macos-15"]
22+
runs-on: macos-12
2923
timeout-minutes: 20
3024
steps:
3125
- name: "Show xcode and SDK version"
@@ -41,23 +35,11 @@ jobs:
4135
with:
4236
go-version: 1.23.x
4337
- name: Make darwin artifacts
44-
run: |
45-
make artifacts-darwin
46-
product_version="$(sw_vers --productVersion | cut -d. -f1)"
47-
# Rename lima-VERSION-Darwin-arm64.tar.gz to lima-VERSION-Darwin_macOS15-arm64.tar.gz
48-
for f in _artifacts/*; do
49-
dst=${f/Darwin/Darwin_macOS${product_version}}
50-
if [ ${product_version} = ${MACOS_LATEST_PRODUCT_VERSION} ]; then
51-
# For the latest macOS release, preserve lima-VERSION-Darwin-arm64.tar.gz
52-
cp -a "${f}" "${dst}"
53-
else
54-
mv "${f}" "${dst}"
55-
fi
56-
done
38+
run: make artifacts-darwin
5739
- name: "Upload artifacts"
5840
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
5941
with:
60-
name: artifacts-darwin-${{ matrix.runner }}
42+
name: artifacts-darwin
6143
path: _artifacts/
6244
release:
6345
# An old release of Ubuntu is chosen for glibc compatibility
@@ -74,8 +56,7 @@ jobs:
7456
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
7557
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
7658
with:
77-
pattern: artifacts-darwin-*
78-
merge-multiple: true
59+
name: artifacts-darwin
7960
path: _artifacts/
8061
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
8162
with:

0 commit comments

Comments
 (0)