Skip to content

Commit 1c98589

Browse files
authored
Merge pull request #2773 from AkihiroSuda/fix-2767
Revert "CI: create separate artifacts for macos-{13,14,15}"; use macOS 15
2 parents 16e7baa + 77a91c5 commit 1c98589

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

.github/workflows/release.yml

+10-23
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ 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+
# The latest release of macOS is used to enable new features.
23+
# https://github.com/lima-vm/lima/issues/2767
24+
#
25+
# Apparently, a binary built on a newer version of macOS can still run on
26+
# an older release of macOS without an error.
27+
# This is quite different from Linux and glibc.
28+
runs-on: macos-15
2929
timeout-minutes: 20
3030
steps:
3131
- name: "Show xcode and SDK version"
@@ -41,23 +41,11 @@ jobs:
4141
with:
4242
go-version: 1.23.x
4343
- 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
44+
run: make artifacts-darwin
5745
- name: "Upload artifacts"
5846
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
5947
with:
60-
name: artifacts-darwin-${{ matrix.runner }}
48+
name: artifacts-darwin
6149
path: _artifacts/
6250
release:
6351
# An old release of Ubuntu is chosen for glibc compatibility
@@ -74,8 +62,7 @@ jobs:
7462
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
7563
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
7664
with:
77-
pattern: artifacts-darwin-*
78-
merge-multiple: true
65+
name: artifacts-darwin
7966
path: _artifacts/
8067
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
8168
with:

0 commit comments

Comments
 (0)