sam/shlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made ./shlaxfile.py build test push to do the right thing

Browse Source
This commit is contained in:
jpic 2020-02-16 16:20:56 +01:00
parent 8b145e6378
commit a720e22a50
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shlax/targets/buildah.py
View File

@ -58,14 +58,6 @@ class Buildah(Localhost):
async def __call__(self, *args, **kwargs): async def __call__(self, *args, **kwargs):
result = await super().__call__(*args, **kwargs) result = await super().__call__(*args, **kwargs)
if 'test' in self.kwargs and self.is_runnable():
self.output.test(self)
await self.action('Docker',
*self.kwargs['test'].actions,
image=self.image,
mount={'.': '/app'},
workdir='/app',
)(*args, **kwargs)
return result return result
async def config(self, line): async def config(self, line):
@ -185,6 +177,14 @@ class Buildah(Localhost):
await self.exec('umount', self.mnt / str(dst)[1:], buildah=False) await self.exec('umount', self.mnt / str(dst)[1:], buildah=False)
if self.status == 'success': if self.status == 'success':
if 'test' in self.kwargs and 'test' in args:
self.output.test(self)
await self.action('Docker',
*self.kwargs['test'].actions,
image=self.image,
mount={'.': '/app'},
workdir='/app',
)(*args, **kwargs)
await self.commit() await self.commit()
if self.mnt is not None: if self.mnt is not None: