diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-07-02 17:02:39 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-07-02 17:02:39 +0000 |
commit | 81a805787f25f9b88e20237b29078ed0f8b740bf (patch) | |
tree | 9526207e36663cc8952aab3980a5adae91469c35 | |
parent | 620e293cfed88960db559e931006ad4ddcfcf8f2 (diff) | |
parent | 029a27e11d73c6dc76b934662e5f53fc9e818446 (diff) | |
download | ambient-ci-81a805787f25f9b88e20237b29078ed0f8b740bf.tar.gz |
Merge branch 'liw/tar-up-deps' into 'main'
feat: --dependencies specifies directory, not tar
See merge request larswirzenius/ambient-ci!22
-rwxr-xr-x | ambient-run | 10 | ||||
-rwxr-xr-x | test-project/.ambient-script | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ambient-run b/ambient-run index e0e2ce8..d812232 100755 --- a/ambient-run +++ b/ambient-run @@ -114,13 +114,15 @@ def main(): "cache drive {cache_drive} is larger than max allowed, oh well" ) + deps_drive = os.path.join(tmp, "deps.tar") + logging.info(f"using {deps_drive} as the dependencies drive") + tar = tarfile.open(name=deps_drive, mode="w:") if args.dependencies is None: - deps_drive = os.path.join(tmp, "deps.tar") - tar = tarfile.open(name=deps_drive, mode="w:") tar.close() else: - deps.drive = args.dependencies - logging.info(f"using {deps_drive} as cache drive") + # Tar up the dependencies directory. + tar.add(args.dependencies, arcname=".") + tar.close() logging.info("run build in VM") argv = [ diff --git a/test-project/.ambient-script b/test-project/.ambient-script index d226b2f..9a945bd 100755 --- a/test-project/.ambient-script +++ b/test-project/.ambient-script @@ -6,7 +6,11 @@ echo "hello from test-project's ambient script: $*" cat /proc/cmdline ls -l /dev/vd? -ls -l /workspace + +echo "------------------------------------------" +echo "Workspace contents" +find /workspace -type f -ls +echo "------------------------------------------" output="$1" |