From 4bfe7ccd6553a5cc2bbda7f93f97c4459033291c Mon Sep 17 00:00:00 2001 From: Haolan Date: Tue, 17 Jun 2025 16:02:54 +0800 Subject: [PATCH 1/4] ci: move cjson dep --- .github/actions/setup-llcppg/action.yml | 4 +--- .github/workflows/gentest.yml | 9 ++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup-llcppg/action.yml b/.github/actions/setup-llcppg/action.yml index df6ec10f..32601e7e 100644 --- a/.github/actions/setup-llcppg/action.yml +++ b/.github/actions/setup-llcppg/action.yml @@ -34,8 +34,6 @@ runs: brew link --force libffi echo "$(brew --prefix llvm@${{inputs.llvm}})/bin" >> $GITHUB_PATH echo "$(brew --prefix lld@${{inputs.llvm}})/bin" >> $GITHUB_PATH - # llcppg dependencies - brew install cjson - name: Install dependencies shell: bash if: runner.os == 'Linux' @@ -43,7 +41,7 @@ runs: 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 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo apt-get update - 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 + 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 echo "/usr/lib/llvm-${{inputs.llvm}}/bin" >> $GITHUB_PATH - name: Install LLGo shell: bash diff --git a/.github/workflows/gentest.yml b/.github/workflows/gentest.yml index 50bcba0b..120e088a 100644 --- a/.github/workflows/gentest.yml +++ b/.github/workflows/gentest.yml @@ -35,7 +35,7 @@ jobs: if: startsWith(matrix.os, 'macos') run: | # install demo's lib - brew install lua zlib isl libgpg-error raylib z3 sqlite3 gmp libxml2 libxslt + brew install cjson lua zlib isl libgpg-error raylib z3 sqlite3 gmp libxml2 libxslt # Detect Homebrew prefix for different macOS versions and architectures HOMEBREW_PREFIX=$(brew --prefix) @@ -46,14 +46,17 @@ jobs: export PKG_CONFIG_PATH="$HOMEBREW_PREFIX/opt/libxslt/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags --libs sqlite3 pkg-config --cflags --libs libxslt - + df -lh + lsblk llcppgtest -demos ./_llcppgtest - name: Test demos with generated pkgs if: startsWith(matrix.os, 'ubuntu') run: | # install demo's lib - sudo apt install liblua5.4-dev libsqlite3-dev libgmp-dev libgpg-error-dev zlib1g-dev libisl-dev libz3-dev -y + sudo apt install libcjson-dev liblua5.4-dev libsqlite3-dev libgmp-dev libgpg-error-dev zlib1g-dev libisl-dev libz3-dev -y + df -lh + lsblk llcppgtest -demos ./_llcppgtest - name: Upload Logs to Artifacts uses: actions/upload-artifact@v4 From acfcc2152089267f61a69d687c8c93c913abe7e9 Mon Sep 17 00:00:00 2001 From: Haolan Date: Tue, 17 Jun 2025 16:12:15 +0800 Subject: [PATCH 2/4] ci: fix mac --- .github/workflows/gentest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/gentest.yml b/.github/workflows/gentest.yml index 120e088a..a32ce9c9 100644 --- a/.github/workflows/gentest.yml +++ b/.github/workflows/gentest.yml @@ -47,7 +47,6 @@ jobs: pkg-config --cflags --libs sqlite3 pkg-config --cflags --libs libxslt df -lh - lsblk llcppgtest -demos ./_llcppgtest - name: Test demos with generated pkgs From 1420a9bbe4d34d425b22fb7cc102fd1d69329946 Mon Sep 17 00:00:00 2001 From: Haolan Date: Tue, 17 Jun 2025 16:22:22 +0800 Subject: [PATCH 3/4] ci: fix go test --- .github/workflows/go.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4d7fe362..1aaf0ff1 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -31,6 +31,14 @@ jobs: llvm: ${{ matrix.llvm }} llgo: ${{ matrix.llgo }} + - name: Setup Test Dependencies + if: startsWith(matrix.os, 'macos') + run: brew install cjson + + - name: Setup Test Dependencies + if: startsWith(matrix.os, 'ubuntu') + run: sudo apt install libcjson-dev + - name: Test xtool run: | # llgo test ./_xtool/internal/parser/... From 5fb41c3b5925a2b32d42d25de0ab274aceeb6f71 Mon Sep 17 00:00:00 2001 From: Haolan Date: Tue, 17 Jun 2025 17:16:52 +0800 Subject: [PATCH 4/4] ci: remove hard disk checking --- .github/workflows/gentest.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/gentest.yml b/.github/workflows/gentest.yml index a32ce9c9..7a48744c 100644 --- a/.github/workflows/gentest.yml +++ b/.github/workflows/gentest.yml @@ -46,7 +46,6 @@ jobs: export PKG_CONFIG_PATH="$HOMEBREW_PREFIX/opt/libxslt/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags --libs sqlite3 pkg-config --cflags --libs libxslt - df -lh llcppgtest -demos ./_llcppgtest - name: Test demos with generated pkgs @@ -54,8 +53,6 @@ jobs: run: | # install demo's lib sudo apt install libcjson-dev liblua5.4-dev libsqlite3-dev libgmp-dev libgpg-error-dev zlib1g-dev libisl-dev libz3-dev -y - df -lh - lsblk llcppgtest -demos ./_llcppgtest - name: Upload Logs to Artifacts uses: actions/upload-artifact@v4