diff options
author | Lars Wirzenius <liw@noreply.codeberg.org> | 2023-11-13 07:14:52 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@noreply.codeberg.org> | 2023-11-13 07:14:52 +0000 |
commit | ba749d684e8f171d95d1c955c944bd3eef755c88 (patch) | |
tree | ecfa6cfe88f8866a8bd2969c7ea76e2766319412 | |
parent | d91c330cbf38d13e4510ec980490196089916c68 (diff) | |
parent | 708f01284c5fe710f901adcb64e24be0bd64c010 (diff) | |
download | ambient-build-vm-ba749d684e8f171d95d1c955c944bd3eef755c88.tar.gz |
Merge pull request 'typo' (#10) from typo into main
Reviewed-on: https://codeberg.org/ambient/ambient-build-vm/pulls/10
-rwxr-xr-x | ambient-build-vm | 2 | ||||
-rw-r--r-- | ikiwiki.yml | 2 | ||||
-rw-r--r-- | subplot.yml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ambient-build-vm b/ambient-build-vm index 124c6d6..a2eebc6 100755 --- a/ambient-build-vm +++ b/ambient-build-vm @@ -107,7 +107,7 @@ def build_image(tmp, vmdb, tarball, image): sys.exit(1) # Convert built image from raw to QCOW2 format. - logging.info(f"Convering RAW image to {image}") + logging.info(f"Converting RAW image to {image}") p = subprocess.run( ["qemu-img", "convert", "-f", "raw", "-O", "qcow2", raw, image], capture_output=True, diff --git a/ikiwiki.yml b/ikiwiki.yml index 1978ef5..ded7bd7 100644 --- a/ikiwiki.yml +++ b/ikiwiki.yml @@ -45,8 +45,10 @@ name: - graphviz - ikiwiki + - libimage-magick-perl - pandoc - pandoc-filter-diagram + - perlmagick - plantuml vars: diff --git a/subplot.yml b/subplot.yml index a94aeb3..988795e 100644 --- a/subplot.yml +++ b/subplot.yml @@ -17,7 +17,11 @@ - name: "install rustup" shell: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh - sh /tmp/rustup.sh -y --no-modify-path + sh /tmp/rustup.sh -y --no-modify-path + export PATH="$HOME/.cargo/bin:$PATH" + rustup default stable + rustup show + rustc --version vars: ansible_python_interpreter: /usr/bin/python3 |