Format Vala code

.editorconfig

@@ -15,3 +15,9 @@ indent_style = tab
 
 [*.py]
 indent_size = 4
+
+[*.rs]
+indent_size = 4
+
+[*.vala]
+indent_size = 4

.github/workflows/CI.yaml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   CI:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -17,16 +17,41 @@ jobs:
           node-version: 18
           cache: "npm"
 
-      # See also https://github.com/flatpak/flatpak-github-actions
-      - uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: flatpak flatpak-builder
-          version: 1.0
+      - name: Install host dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install flatpak flatpak-builder mutter
 
-      - name: Cache Flatpak dependencies
-        uses: actions/cache@v3
+      # Restore caches
+      - name: Restore Flatpak dependencies
+        uses: actions/cache/restore@v3
         with:
           path: ~/.local/share/flatpak
-          key: 45
+          key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-flatpak-dependencies-
+      - name: Restore .flatpak-builder
+        uses: actions/cache/restore@v3
+        with:
+          path: Workbench/.flatpak-builder
+          key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-flatpak-builder-
 
+      - run: mutter --wayland --no-x11 --headless --wayland-display=wayland-0 --virtual-monitor 1280x720 > /tmp/mutter.log 2>&1 &
       - run: make ci
+      - run: cat /tmp/mutter.log
+
+      # Save caches
+      - name: Save Flatpak dependencies
+        uses: actions/cache/save@v3
+        if: always()
+        with:
+          path: ~/.local/share/flatpak
+          key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
+      - name: Save .flatpak-builder
+        uses: actions/cache/save@v3
+        if: always()
+        with:
+          path: Workbench/.flatpak-builder
+          key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Workbench"]
+	path = Workbench
+	url = https://github.com/workbenchdev/Workbench.git

Makefile

@@ -3,21 +3,21 @@ SHELL:=/bin/bash -O globstar
 .DEFAULT_GOAL := ci
 
 setup:
-	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//45 org.freedesktop.Sdk.Extension.rust-stable//23.08
-	npm install
-	flatpak-builder --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Demos.json
+	cd Workbench && make build
 
 lint:
 # JavaScript
-# ./node_modules/.bin/eslint --max-warnings=0 src
-	./build-aux/fun biome ci demos/
-# rustfmt
-	./build-aux/fun rustfmt --check --edition 2021 demos/**/*.rs
-# black
-	./build-aux/fun black --check demos/**/*.py
+	./Workbench/build-aux/fun workbench-cli ci javascript demos/**/*.js
+# Vala
+# ./Workbench/build-aux/fun workbench-cli ci vala demos/**/*.vala
 # Blueprint
-	find demos/ -type f -name "*blp" -print0 | xargs -0 ./build-aux/fun blueprint-compiler format
+# ./Workbench/build-aux/fun workbench-cli ci blueprint demos/**/*.blp
+# CSS
+# ./Workbench/build-aux/fun workbench-cli ci css demos/**/*.css
+# Rust
+	./Workbench/build-aux/fun rustfmt --check --edition 2021 demos/**/*.rs
+# Python
+	./Workbench/build-aux/fun black --check demos/**/*.py
 
 test: lint
 

demos/About Window/main.vala

@@ -1,15 +1,15 @@
-#!/usr/bin/env -S vala workbench.vala --pkg gtk4 --pkg libadwaita-1
+#! /usr/bin/env -S vala workbench.vala --pkg gtk4 --pkg libadwaita-1
 
 public void main () {
-	  Gtk.init ();
+    Gtk.init ();
 
-	  var button = workbench.builder.get_object ("button") as Gtk.Button;
-	  button.clicked.connect(on_button_clicked);
+    var button = workbench.builder.get_object ("button") as Gtk.Button;
+    button.clicked.connect (on_button_clicked);
 }
 
 public void on_button_clicked () {
     // https://valadoc.org/libadwaita-1/Adw.AboutWindow.html
-    var dialog = new Adw.AboutWindow() {
+    var dialog = new Adw.AboutWindow () {
         transient_for = workbench.window,
         application_icon = "application-x-executable",
         application_name = "Typeset",
@@ -26,17 +26,17 @@ public void on_button_clicked () {
         translator_credits = "translator-credits",
     };
     dialog.add_link (
-        "Documentation",
-        "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.4/class.AboutWindow.html"
+                     "Documentation",
+                     "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.4/class.AboutWindow.html"
     );
     dialog.add_legal_section (
-        "Fonts",
-        null,
-        Gtk.License.CUSTOM,
-        "This application uses font data from <a href='https://example.org'>somewhere</a>."
+                              "Fonts",
+                              null,
+                              Gtk.License.CUSTOM,
+                              "This application uses font data from <a href='https://example.org'>somewhere</a>."
     );
 
-    dialog.add_acknowledgement_section ("Special thanks to", { "My cat" } );
+    dialog.add_acknowledgement_section ("Special thanks to", { "My cat" });
 
-    dialog.present();
+    dialog.present ();
 }