diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-07-31 16:57:54 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-07-31 16:57:54 +0000 |
commit | 115806eaa7858e285c211958641762e57e9dc497 (patch) | |
tree | 7776d23dcefaa81bd69b3f38f9c3377efed72e0c | |
parent | c17ca22348cc389213b6affae26d5d84376e81ed (diff) | |
parent | c00158b2ebf120c49dcd699b53d02c384fce3a72 (diff) | |
download | ambient-ci-115806eaa7858e285c211958641762e57e9dc497.tar.gz |
Merge branch 'liw/arch' into 'main'
fix: update ikiwiki.sh to current ambient-run CLI
See merge request larswirzenius/ambient-ci!31
-rwxr-xr-x | ikiwiki.sh | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -44,12 +44,17 @@ cp "$ambientdir/ikiwiki-ambient-script" "$script" # directory. An incremental build needs the local html directory and # the site's .ikiwiki directory, and changes to those need to persist # between runs, so we use the cache mechanism. + +cat <<EOF >"$tmp/build.yaml" +image: ~/tmp/ambient/ambient-ikiwiki.qcow2 +src: $srcdir +cache: $cache +dependencies: ~/.ikiwiki/ +EOF + "$ambientdir/ambient-run" \ - --image ~/tmp/ambient/ambient-ikiwiki.qcow2 \ - --dependencies ~/.ikiwiki/ \ - --cache "$cache" \ --log ~/tmp/ambient/log \ - "$srcdir" + "$tmp/build.yaml" # Remove the script installed one. rm "$script" |