Skip to content

Commit ed76667

Browse files
committed
switch to brew clang in runner
1 parent 8fdc828 commit ed76667

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
runs:
2+
using: "composite"
3+
steps:
4+
- shell: bash
5+
run: |
6+
brew install llvm
7+
LLVM_PREFIX=$(brew --prefix llvm)
8+
echo "${LLVM_PREFIX}/bin" >> $GITHUB_PATH
9+
echo "CC=${LLVM_PREFIX}/bin/clang" >> $GITHUB_ENV
10+
echo "CXX=${LLVM_PREFIX}/bin/clang++" >> $GITHUB_ENV

.github/workflows/desktop_cd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
lfs: true
8888
fetch-depth: 0
8989
fetch-tags: true
90+
- uses: ./.github/actions/brew_clang
9091
- run: ./scripts/version.sh "./apps/desktop/src-tauri/tauri.conf.json" "${{ needs.compute-version.outputs.version }}"
9192
- uses: ./.github/actions/install_desktop_deps
9293
with:
@@ -149,7 +150,6 @@ jobs:
149150
VITE_APP_URL: "https://hyprnote.com"
150151
VITE_API_URL: "https://api.hyprnote.com"
151152
VITE_PRO_PRODUCT_ID: ${{ secrets.VITE_PRO_PRODUCT_ID }}
152-
CMAKE_ARGS: ${{ matrix.arch == 'aarch64' && '-DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8-a' || '' }}
153153
- run: |
154154
mkdir -p target/release/
155155
find target/${{ matrix.target }}/release -type f -not -path "*/\.*" -exec cp {} target/release/ \;

.github/workflows/desktop_ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
runs-on: ${{ matrix.runner }}
3535
steps:
3636
- uses: actions/checkout@v4
37+
- if: matrix.platform == 'macos'
38+
uses: ./.github/actions/brew_clang
3739
- uses: ./.github/actions/pnpm_install
3840
- uses: denoland/setup-deno@v2
3941
- run: pnpm -F ui build

0 commit comments

Comments
 (0)