Merge branch 'fo' into 'master'

Revert "ci: Use bookworm image"

See merge request World/Phosh/squeekboard!509

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: $CI_REGISTRY/world/phosh/phosh/debian:v0.0.20211208
+image: debian:bullseye
 
 stages:
 - build
@@ -6,7 +6,10 @@ stages:
 
 before_script:
 - apt-get -y update
-  - apt-get -y install ca-certificates
+- apt-get -y install wget ca-certificates gnupg
+- echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
+- wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+- apt-get -y update
 
 build_docs:
   stage: build
@@ -53,7 +56,6 @@ build_deb:
   - cp ../*.deb .
 
 build_deb:arm64:
-  image: debian:bookworm
   tags:
   - aarch64
   stage: build

tools/yamlfmt

@@ -4,7 +4,8 @@
 Usage: yamlfmt.py [--apply] file.yaml
 """
 
-import ruamel.yaml
+import io
+from ruamel.yaml import YAML
 import sys
 
 args = sys.argv[:]
@@ -16,10 +17,16 @@ except ValueError:
 
 path = args[1]
 
+def dump(yaml, yml):
+    buf = io.BytesIO()
+    yaml.dump(yml, buf)
+    return buf.getvalue().decode('utf-8')
+
 with open(path) as f:
     contents = f.read()
-    yml = ruamel.yaml.round_trip_load(contents)
+    yaml = YAML()
-    formatted = ruamel.yaml.round_trip_dump(yml, block_seq_indent=2)
+    yml = yaml.load(contents)
+    formatted = dump(yaml, yml)
     well_formatted = formatted == contents
         
 if not well_formatted: