Skip to content

Commit 369804a

Browse files
committed
fix: add the arm libsodium to path
1 parent 94499e6 commit 369804a

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ jobs:
106106
architecture: ${{ matrix.node_arch }}
107107
cache: "pnpm"
108108

109-
- name: Install Mac-OS ${{ matrix.ARCH }} Dependencies
109+
- name: Install Mac-OS x86_64 Dependencies
110110
if: ${{ contains(matrix.os, 'macos') && matrix.ARCH == 'x86_64' }}
111111
run: |
112112
brew install libsodium gnutls
113113
114-
- name: Install Mac-OS ${{ matrix.ARCH }} Dependencies
114+
- name: Install Mac-OS arm64 Dependencies
115115
if: ${{ contains(matrix.os, 'macos') && matrix.ARCH == 'arm64' }}
116116
run: |
117117
brew uninstall libsodium --force --ignore-dependencies
118118
chmod +x ./script/macos-arm-deps.sh
119-
./script/macos-arm-deps.sh
119+
source ./script/macos-arm-deps.sh
120120
121121
- name: Install Dependencies and Build
122122
if: ${{ !matrix.docker }}

script/macos-arm-deps.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,27 @@ arm-brew fetch --deps --bottle-tag=$bottle_tag $dependencies |
2525
grep -E "(Downloaded to:|Already downloaded:)" |
2626
grep -v pkg-config |
2727
awk '{ print $3 }' |
28-
xargs -n 1 arm-brew install --ignore-dependencies --force-bottle
28+
xargs -n 1 arm-brew install --force-bottle
2929

3030
# Install host version of pkg-config so we can call it in the build system
3131
arm-brew install pkg-config
3232
ln -s ~/arm-target/arm-homebrew/bin/pkg-config ~/arm-target/bin/arm-pkg-config
3333

34+
export PATH="$HOME/arm-target/arm-homebrew/bin/:$PATH"
35+
export PATH="$HOME/arm-target/arm-homebrew/lib/:$PATH"
36+
3437
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"

0 commit comments

Comments
 (0)