diff options
| author | ruki <[email protected]> | 2025-01-13 11:41:19 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-13 11:41:19 +0800 |
| commit | bc442246a3f08958726b5506d84fad78664312b3 (patch) | |
| tree | 09ddd5fbbe300d47ace9bd7dea9a34de36c6d1ff | |
| parent | eb5e21b16f5f3d27fe7a8a432b3434502aa682de (diff) | |
| parent | 1c6398f0ad99a00788efab9520088b7f52a4d36e (diff) | |
Merge pull request #6065 from xmake-io/ci
fix ci
| -rw-r--r-- | .github/workflows/linux.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/linux_luajit.yml | 2 | ||||
| -rw-r--r-- | tests/projects/c++/modules/test_headerunits.lua | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8d95f15de..d4f1eeb12 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,8 +30,9 @@ jobs: - name: Prepare run: | sudo apt update - sudo apt install -y ruby ruby-dev rubygems build-essential llvm + sudo apt install -y ruby ruby-dev rubygems build-essential llvm libc++-dev sudo apt install -y libgl1-mesa-dev libglu1-mesa-dev + clang --version - name: Tests run: | diff --git a/.github/workflows/linux_luajit.yml b/.github/workflows/linux_luajit.yml index 946e6f2a5..acec3fbce 100644 --- a/.github/workflows/linux_luajit.yml +++ b/.github/workflows/linux_luajit.yml @@ -33,7 +33,7 @@ jobs: - name: Prepare run: | sudo apt update - sudo apt install -y build-essential llvm + sudo apt install -y build-essential llvm libc++-dev sudo apt install -y libgl1-mesa-dev libglu1-mesa-dev - name: Tests diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua index 70e8b3d51..b13b22a7f 100644 --- a/tests/projects/c++/modules/test_headerunits.lua +++ b/tests/projects/c++/modules/test_headerunits.lua @@ -51,7 +51,7 @@ function main(t) end local clang = find_tool("clang", {version = true}) if clang and clang.version then - if semver.compare(clang.version, "15.0") >= 0 then + if semver.compare(clang.version, "19.0") >= 0 then os.exec("xmake clean -a") -- clang-scan-deps dependency detection doesn't support header units atm os.exec("xmake f --toolchain=clang --policies=build.c++.clang.fallbackscanner -c --yes") |