File tree 2 files changed +8
-16
lines changed
2 files changed +8
-16
lines changed Original file line number Diff line number Diff line change @@ -42,13 +42,13 @@ jobs:
42
42
arch : arm64
43
43
timeout-minutes : 20
44
44
steps :
45
- # We need to use Xcode 11.7 for maximum compatibility with older macOS (x64)
46
- - name : Switch to Xcode 11.7
45
+ # We need to use Xcode 14.3 for maximum compatibility with older macOS (x64)
46
+ - name : Switch to oldest available Xcode
47
47
if : matrix.targetPlatform == 'macOS' && matrix.arch == 'x64'
48
48
run : |
49
- sudo xcode-select -s /Applications/Xcode_11.7 .app/Contents/Developer/
49
+ sudo xcode-select -s /Applications/Xcode_14.3.1 .app/Contents/Developer/
50
50
# Delete the command line tools to make sure they don't get our builds
51
- # messed up with macOS SDK 11 stuff.
51
+ # messed up with macOS SDK stuff.
52
52
sudo rm -rf /Library/Developer/CommandLineTools
53
53
- uses : actions/checkout@v4
54
54
with :
58
58
- name : Install go
59
59
if : matrix.targetPlatform == 'macOS'
60
60
uses : actions/setup-go@v5
61
+ with :
62
+ go-version : ' stable'
61
63
- name : Install dependencies
62
64
run : npm install
63
65
- name : Check formatting
Original file line number Diff line number Diff line change 5
5
6
6
set -eu -o pipefail
7
7
8
- MACOSX_BUILD_VERSION=" 10.9"
8
+ MACOSX_BUILD_VERSION=" 10.15"
9
+ HOST_CPU=arm64
9
10
10
11
if [ " $TARGET_ARCH " = " x64" ]; then
11
- HOST_CPU=x86_64
12
12
TARGET_CFLAGS=" -target x86_64-apple-darwin"
13
13
GOARCH=amd64
14
14
else
15
- HOST_CPU=arm64
16
15
TARGET_CFLAGS=" -target arm64-apple-darwin"
17
16
GOARCH=arm64
18
17
fi
@@ -76,15 +75,6 @@ if [[ "$GIT_LFS_VERSION" ]]; then
76
75
git clone -b " v$GIT_LFS_VERSION " " https://github.com/git-lfs/git-lfs"
77
76
(
78
77
cd git-lfs
79
-
80
- # HACK: When cross-compiling, there seems to be an issue when git-lfs attempts
81
- # to generate the manpage contents, and it seems that preffixing that command
82
- # with `GOARCH=` to use the host architecture fixes the issue.
83
- # This hack can be removed once the issue is fixed via the PR
84
- # https://github.com/git-lfs/git-lfs/pull/4492 or some other solution.
85
- GO_GENERATE_STRING=" \$ (GO) generate github.com\/git-lfs\/git-lfs\/commands"
86
- sed -i -e " s/$GO_GENERATE_STRING /GOARCH= $GO_GENERATE_STRING /" Makefile
87
-
88
78
make GOARCH=" $GOARCH " CGO_CFLAGS=" -mmacosx-version-min=$MACOSX_BUILD_VERSION " CGO_LDFLAGS=" -mmacosx-version-min=$MACOSX_BUILD_VERSION " BUILTIN_LD_FLAGS=" -linkmode external"
89
79
)
90
80
GIT_LFS_BINARY_PATH=" git-lfs/bin/git-lfs"
You can’t perform that action at this time.
0 commit comments