summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-01-12 23:18:52 +0800
committerruki <[email protected]>2025-01-12 23:18:52 +0800
commita63b9985d18531937fac56437f8baf71a879883b (patch)
tree9e2f17cb14d81aec40e78829a46861a41b8bddf0
parentc9f630737ed79ff4b56f9ea74656492db5b45dcb (diff)
install libc++ on linux ci
-rw-r--r--.github/workflows/linux.yml2
-rw-r--r--.github/workflows/linux_luajit.yml2
-rw-r--r--tests/projects/c++/modules/test_base.lua8
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8d95f15de..afbe7486b 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -30,7 +30,7 @@ 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
- name: Tests
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_base.lua b/tests/projects/c++/modules/test_base.lua
index 3f12d860e..80206983a 100644
--- a/tests/projects/c++/modules/test_base.lua
+++ b/tests/projects/c++/modules/test_base.lua
@@ -58,11 +58,11 @@ function main(t)
end
local clang = find_tool("clang", {version = true})
if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then
- os.vexec("xmake clean -a")
- os.vexec("xmake f --toolchain=clang -c --yes")
+ os.exec("xmake clean -a")
+ os.exec("xmake f --toolchain=clang -c --yes")
_build()
- os.vexec("xmake clean -a")
- os.vexec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+ os.exec("xmake clean -a")
+ os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
_build()
end
end