File tree Expand file tree Collapse file tree 2 files changed +21
-4
lines changed Expand file tree Collapse file tree 2 files changed +21
-4
lines changed Original file line number Diff line number Diff line change @@ -106,17 +106,17 @@ jobs:
106
106
architecture : ${{ matrix.node_arch }}
107
107
cache : " pnpm"
108
108
109
- - name : Install Mac-OS ${{ matrix.ARCH }} Dependencies
109
+ - name : Install Mac-OS x86_64 Dependencies
110
110
if : ${{ contains(matrix.os, 'macos') && matrix.ARCH == 'x86_64' }}
111
111
run : |
112
112
brew install libsodium gnutls
113
113
114
- - name : Install Mac-OS ${{ matrix.ARCH }} Dependencies
114
+ - name : Install Mac-OS arm64 Dependencies
115
115
if : ${{ contains(matrix.os, 'macos') && matrix.ARCH == 'arm64' }}
116
116
run : |
117
117
brew uninstall libsodium --force --ignore-dependencies
118
118
chmod +x ./script/macos-arm-deps.sh
119
- ./script/macos-arm-deps.sh
119
+ source ./script/macos-arm-deps.sh
120
120
121
121
- name : Install Dependencies and Build
122
122
if : ${{ !matrix.docker }}
Original file line number Diff line number Diff line change @@ -25,10 +25,27 @@ arm-brew fetch --deps --bottle-tag=$bottle_tag $dependencies |
25
25
grep -E " (Downloaded to:|Already downloaded:)" |
26
26
grep -v pkg-config |
27
27
awk ' { print $3 }' |
28
- xargs -n 1 arm-brew install --ignore-dependencies -- force-bottle
28
+ xargs -n 1 arm-brew install --force-bottle
29
29
30
30
# Install host version of pkg-config so we can call it in the build system
31
31
arm-brew install pkg-config
32
32
ln -s ~ /arm-target/arm-homebrew/bin/pkg-config ~ /arm-target/bin/arm-pkg-config
33
33
34
+ export PATH=" $HOME /arm-target/arm-homebrew/bin/:$PATH "
35
+ export PATH=" $HOME /arm-target/arm-homebrew/lib/:$PATH "
36
+
34
37
cd " $PREV_PWD "
38
+
39
+ # libsodium
40
+ export PATH=" $HOME /arm-target/Cellar/libsodium/1.0.18_1/lib:$PATH "
41
+ export PKG_CONFIG_PATH=" $HOME /arm-target/Cellar/libsodium/1.0.18_1/lib:$PKG_CONFIG_PATH "
42
+
43
+ # gnutils
44
+ export GUILE_TLS_CERTIFICATE_DIRECTORY=/Users/runner/arm-target/etc/gnutls/
45
+ export PATH=" $HOME /arm-target/opt/gnu-sed/libexec/gnubin:$PATH "
46
+ export PATH=" $HOME /arm-target/opt/m4/bin:$PATH "
47
+ export LDFLAGS=" -L$HOME /arm-target/opt/readline/lib $LDFLAGS "
48
+ export CPPFLAGS=" -I$HOME /arm-target/opt/readline/include $CPPFLAGS "
49
+ export PKG_CONFIG_PATH=" $HOME /arm-target/opt/readline/lib/pkgconfig:$PKG_CONFIG_PATH "
50
+ export PKG_CONFIG_PATH=
" $HOME /arm-target/opt/[email protected] /lib/pkgconfig:$PKG_CONFIG_PATH "
51
+ export PKG_CONFIG_PATH=" $HOME /arm-target/opt/readline/lib/pkgconfig:$PKG_CONFIG_PATH "
You can’t perform that action at this time.
0 commit comments