diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
| commit | eaf6343c065842b9719793066e765b2e5f1c2f3b (patch) | |
| tree | 1bfeac5297ba489721e704e63c28f33d0fb98990 /ci/ciimage/build.py | |
| parent | 87aa98c1787d800145853a8e84654e4c54ee1078 (diff) | |
| parent | 70edf82c6c77902cd64f44848302bbac92d611d8 (diff) | |
| download | meson-lang-enum.zip meson-lang-enum.tar.gz meson-lang-enum.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum
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') |