json: ensure py/js schema conv tested on ubuntu-focal-make

This commit is contained in:
ochafik 2024-03-22 01:00:42 +00:00
parent ef3565fe0d
commit cbb3e2f629
2 changed files with 13 additions and 2 deletions

View file

@ -135,6 +135,9 @@ jobs:
ubuntu-focal-make:
runs-on: ubuntu-20.04
env:
LLAMA_NODE_AVAILABLE: true
LLAMA_PYTHON_AVAILABLE: true
steps:
- name: Clone
@ -147,6 +150,14 @@ jobs:
sudo apt-get update
sudo apt-get install build-essential gcc-8
- uses: actions/setup-node@v4
with:
node-version: "20"
- uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Build
id: make_build
env:

View file

@ -804,7 +804,7 @@ int main() {
}
});
if (std::system("python --version") == 0) {
if (getenv("LLAMA_PYTHON_AVAILABLE") || (std::system("python --version") == 0)) {
test_all("Python", [](const TestCase & tc) {
write("test-json-schema-input.tmp", tc.schema);
tc.verify_status(std::system(
@ -815,7 +815,7 @@ int main() {
fprintf(stderr, "\033[33mWARNING: Python not found, skipping Python JSON schema -> grammar tests.\n\033[0m");
}
if (std::system("node --version") == 0) {
if (getenv("LLAMA_NODE_AVAILABLE") || (std::system("node --version") == 0)) {
test_all("JavaScript", [](const TestCase & tc) {
write("test-json-schema-input.tmp", tc.schema);
tc.verify_status(std::system(