diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-29 18:23:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 18:23:23 +0300 |
| commit | 6e794c380ba2febe67f563c3388797b8b4482f82 (patch) | |
| tree | eacb4e6f629d7292d9e22825be10f915b3f9ca10 /ci/ciimage/build.py | |
| parent | 1cf7f40e8542acf3b65ec18e1414edb65113fe42 (diff) | |
| parent | eefc7d450c7839db63df2d8a6e4bcc991205a058 (diff) | |
| download | meson-6e794c380ba2febe67f563c3388797b8b4482f82.zip meson-6e794c380ba2febe67f563c3388797b8b4482f82.tar.gz meson-6e794c380ba2febe67f563c3388797b8b4482f82.tar.bz2 | |
Merge pull request #6911 from mensinda/ciBionic
ci: Add Ubuntu Bionic image
Diffstat (limited to 'ci/ciimage/build.py')
| -rwxr-xr-x | ci/ciimage/build.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py index 34a92fa..e623a7e 100755 --- a/ci/ciimage/build.py +++ b/ci/ciimage/build.py @@ -71,6 +71,9 @@ class Builder(BuilderBase): for key, val in self.image_def.env.items(): out_data += f'export {key}="{val}"\n' + # Also add /ci to PATH + out_data += 'export PATH="/ci:$PATH"\n' + out_file.write_text(out_data) # make it executable @@ -157,7 +160,7 @@ class ImageTester(BuilderBase): test_cmd = [ self.docker, 'run', '--rm', '-t', 'meson_test_image', - '/usr/bin/bash', '-c', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS' + '/bin/bash', '-c', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS' ] if subprocess.run(test_cmd).returncode != 0: raise RuntimeError('Running tests failed') |