Skip to content

Commit

Permalink
Merge pull request #6065 from xmake-io/ci
Browse files Browse the repository at this point in the history
fix ci
  • Loading branch information
waruqi authored Jan 13, 2025
2 parents eb5e21b + 1c6398f commit bc44224
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_luajit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/projects/c++/modules/test_headerunits.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit bc44224

Please sign in to comment.