diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-24 03:02:41 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-24 03:06:24 +0530 |
| commit | b26dd48d4d6dc44e00a708d544b7d88d4331d9f3 (patch) | |
| tree | 81a9406ecb096cd65b1e2edb2cde45e71ff3d79d | |
| parent | e6bd48309445fe645cf32fd690e51d98d4776dad (diff) | |
| download | meson-b26dd48d4d6dc44e00a708d544b7d88d4331d9f3.zip meson-b26dd48d4d6dc44e00a708d544b7d88d4331d9f3.tar.gz meson-b26dd48d4d6dc44e00a708d544b7d88d4331d9f3.tar.bz2 | |
ci: Don't require ninja >= 1.9 on Xenial/Bionic CI
Those distros do not ship with the latest Ninja, and we should be
testing with the Ninja that they ship.
| -rw-r--r-- | .github/workflows/os_comp.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/unusedargs_missingreturn.yml | 1 | ||||
| -rwxr-xr-x | run_project_tests.py | 4 | ||||
| -rwxr-xr-x | run_tests.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index a4417a1..d721dbe 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -24,7 +24,7 @@ jobs: run: python3 run_tests.py env: CI: '1' - XENIAL: '1' + OLD_OS_CI: '1' arch: name: Arch Linux diff --git a/.github/workflows/unusedargs_missingreturn.yml b/.github/workflows/unusedargs_missingreturn.yml index fa4405b..fb40a48 100644 --- a/.github/workflows/unusedargs_missingreturn.yml +++ b/.github/workflows/unusedargs_missingreturn.yml @@ -44,6 +44,7 @@ jobs: - run: python run_project_tests.py --only cmake common fortran platform-linux "objective c" "objective c++" env: CI: "1" + OLD_OS_CI: "1" CFLAGS: "-Werror=unused-parameter -Werror=return-type -Werror=strict-prototypes" CPPFLAGS: "-Werror=unused-parameter -Werror=return-type" FFLAGS: "-fimplicit-none" diff --git a/run_project_tests.py b/run_project_tests.py index eb0b5e1..a52258b 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -109,7 +109,7 @@ class AutoDeletedDir: failing_logs = [] print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ under_ci = 'CI' in os.environ -under_xenial_ci = under_ci and ('XENIAL' in os.environ) +under_old_os_ci = 'OLD_OS_CI' in os.environ do_debug = under_ci or print_debug no_meson_log_msg = 'No meson-log.txt found.' @@ -601,7 +601,7 @@ def have_java(): def skippable(suite, test): # Everything is optional when not running on CI, or on Ubuntu 16.04 CI - if not under_ci or under_xenial_ci: + if not under_ci or under_old_os_ci: return True if not suite.endswith('frameworks'): diff --git a/run_tests.py b/run_tests.py index c811705..3792f64 100755 --- a/run_tests.py +++ b/run_tests.py @@ -212,7 +212,7 @@ def get_backend_commands(backend, debug=False): NINJA_1_9_OR_NEWER = True else: mlog.warning('Found ninja <1.9, tests will run slower', once=True) - if 'CI' in os.environ: + if 'CI' in os.environ and 'OLD_OS_CI' not in os.environ: raise RuntimeError('Require ninja >= 1.9 when running on Meson CI') break cmd = [ninja_cmd, '-w', 'dupbuild=err', '-d', 'explain'] |