diff options
| author | Lars Wirzenius <liw@liw.fi> | 2023-07-04 16:34:13 +0000 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2023-07-04 16:34:13 +0000 |
| commit | 4d0e933d0f243f771958ad3e590d69bbf304b5ac (patch) | |
| tree | 8f7dbc7063f3bc028a21df656e5cb4276b46216a | |
| parent | 81a805787f25f9b88e20237b29078ed0f8b740bf (diff) | |
| parent | f67e070e0fb5c9bebc559207dfec454ae71cd7d0 (diff) | |
| download | ambient-ci-4d0e933d0f243f771958ad3e590d69bbf304b5ac.tar.gz | |
Merge branch 'liw/tar-up-deps' into 'main'
various improvements on the way to being practical
See merge request larswirzenius/ambient-ci!23
| -rw-r--r-- | ambient-build.service | 2 | ||||
| -rwxr-xr-x | ambient-run-script | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ambient-build.service b/ambient-build.service index b739779..8ea4592 100644 --- a/ambient-build.service +++ b/ambient-build.service @@ -6,5 +6,5 @@ WantedBy=multi-user.target [Service] Type=oneshot -ExecStart=/bin/ambient-run-script -t /dev/ttyS0 -s /dev/vdb -a /dev/vdc -c /dev/vdd -d /dev/vde +ExecStart=/bin/bash -c '/bin/ambient-run-script -t /dev/ttyS0 -s /dev/vdb -a /dev/vdc -c /dev/vdd -d /dev/vde >/dev/ttyS0 2>&1 || true' ExecStart=/sbin/poweroff diff --git a/ambient-run-script b/ambient-run-script index 0f6bfce..a4483f1 100755 --- a/ambient-run-script +++ b/ambient-run-script @@ -17,7 +17,6 @@ class RunScript: def msg(self, txt): self.log.write(f"{txt}\n") self.log.flush() - sys.stdout.write(f"{txt}\n") def join(self, path): return os.path.join(self.root, f"./{path}") @@ -82,11 +81,10 @@ class RunScript: with open(self.args.tty, "wb") as stdout: p = subprocess.run( [f"./{script}", os.path.abspath(self.args.artifact)], - stdout=subprocess.PIPE, + stdout=stdout, stderr=subprocess.STDOUT, cwd=src, ) - self.msg(f"stdout: {p.stdout.decode()}") def save_cache(self): self.msg(f"save /workspace/cache to {self.args.cache}") |