Skip to content

Commit 0ff435d

Browse files
authored
ci: move cjson dep (#464)
* ci: move cjson dep * ci: fix mac * ci: fix go test * ci: remove hard disk checking
1 parent 0d21a1e commit 0ff435d

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/actions/setup-llcppg/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@ runs:
3434
brew link --force libffi
3535
echo "$(brew --prefix llvm@${{inputs.llvm}})/bin" >> $GITHUB_PATH
3636
echo "$(brew --prefix lld@${{inputs.llvm}})/bin" >> $GITHUB_PATH
37-
# llcppg dependencies
38-
brew install cjson
3937
- name: Install dependencies
4038
shell: bash
4139
if: runner.os == 'Linux'
4240
run: |
4341
echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-${{inputs.llvm}} main" | sudo tee /etc/apt/sources.list.d/llvm.list
4442
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
4543
sudo apt-get update
46-
sudo apt-get install -y llvm-${{inputs.llvm}}-dev clang-${{inputs.llvm}} libclang-${{inputs.llvm}}-dev lld-${{inputs.llvm}} libunwind-${{inputs.llvm}}-dev libc++-${{inputs.llvm}}-dev pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev libuv1-dev
44+
sudo apt-get install -y llvm-${{inputs.llvm}}-dev clang-${{inputs.llvm}} libclang-${{inputs.llvm}}-dev lld-${{inputs.llvm}} libunwind-${{inputs.llvm}}-dev libc++-${{inputs.llvm}}-dev pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libuv1-dev
4745
echo "/usr/lib/llvm-${{inputs.llvm}}/bin" >> $GITHUB_PATH
4846
- name: Install LLGo
4947
shell: bash

.github/workflows/gentest.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: startsWith(matrix.os, 'macos')
3636
run: |
3737
# install demo's lib
38-
brew install lua zlib isl libgpg-error raylib z3 sqlite3 gmp libxml2 libxslt
38+
brew install cjson lua zlib isl libgpg-error raylib z3 sqlite3 gmp libxml2 libxslt
3939
4040
# Detect Homebrew prefix for different macOS versions and architectures
4141
HOMEBREW_PREFIX=$(brew --prefix)
@@ -46,14 +46,13 @@ jobs:
4646
export PKG_CONFIG_PATH="$HOMEBREW_PREFIX/opt/libxslt/lib/pkgconfig:$PKG_CONFIG_PATH"
4747
pkg-config --cflags --libs sqlite3
4848
pkg-config --cflags --libs libxslt
49-
5049
llcppgtest -demos ./_llcppgtest
5150
5251
- name: Test demos with generated pkgs
5352
if: startsWith(matrix.os, 'ubuntu')
5453
run: |
5554
# install demo's lib
56-
sudo apt install liblua5.4-dev libsqlite3-dev libgmp-dev libgpg-error-dev zlib1g-dev libisl-dev libz3-dev -y
55+
sudo apt install libcjson-dev liblua5.4-dev libsqlite3-dev libgmp-dev libgpg-error-dev zlib1g-dev libisl-dev libz3-dev -y
5756
llcppgtest -demos ./_llcppgtest
5857
- name: Upload Logs to Artifacts
5958
uses: actions/upload-artifact@v4

.github/workflows/go.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ jobs:
3131
llvm: ${{ matrix.llvm }}
3232
llgo: ${{ matrix.llgo }}
3333

34+
- name: Setup Test Dependencies
35+
if: startsWith(matrix.os, 'macos')
36+
run: brew install cjson
37+
38+
- name: Setup Test Dependencies
39+
if: startsWith(matrix.os, 'ubuntu')
40+
run: sudo apt install libcjson-dev
41+
3442
- name: Test xtool
3543
run: |
3644
# llgo test ./_xtool/internal/parser/...

0 commit comments

Comments
 (0)