Merge master reg (#1864)

merge master and solve conflicts
agama-project · Jan 7, 2025 · 52f4da9 · 52f4da9
2 parents 8182c1c + 6d0919e
commit 52f4da9
Show file tree

Hide file tree

Showing 205 changed files with 4,061 additions and 3,456 deletions.
diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
@@ -71,6 +71,7 @@ jobs:
       run: zypper --non-interactive install
         clang-devel
         dbus-1-daemon
+        golang-github-google-jsonnet
         jq
         libopenssl-3-devel
         openssl-3

diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -52,7 +52,7 @@ jobs:
         run: cd web && npm ci
 
       - name: Build Web UI documentation
-        run: cd web && npm run typedoc:client && mv typedoc.out/ ../doc/dist/web-ui
+        run: cd web && npm run typedoc && mv typedoc.out/ ../doc/dist/web-ui
 
       - name: Setup Pages
         uses: actions/configure-pages@v3