Merge branch 'main' into dima/include-session-in-live-query

# Conflicts: # core/src/doc/lives.rs
blaginin · Aug 21, 2024 · 62d436c · 62d436c
2 parents cc2b1ad + f795434
commit 62d436c
Show file tree

Hide file tree

Showing 588 changed files with 20,413 additions and 23,995 deletions.
diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/supply-chain.yml
@@ -10,6 +10,8 @@ on:
       - Cargo.toml
       - core/Cargo.toml
       - lib/Cargo.toml
+      - build.rs
+      - lib/build.rs
       - supply-chain/audits.toml
       - supply-chain/config.toml
       - supply-chain/imports.lock
@@ -23,6 +25,8 @@ on:
       - Cargo.toml
       - core/Cargo.toml
       - lib/Cargo.toml
+      - build.rs
+      - lib/build.rs
       - supply-chain/audits.toml
       - supply-chain/config.toml
       - supply-chain/imports.lock

diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@ Temporary Items
 
 **/*.rs.bk
 *.db
+*.skv
 *.sw?
 *.skv
 
@@ -55,4 +56,5 @@ Temporary Items
 /store/
 surreal
 history.txt
+/doc/tla/states/
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ Temporary Items @@
     **/*.rs.bk
     *.db
+    *.skv
     *.sw?
     *.skv
@@ Expand Down Expand Up / @@ -55,4 +56,5 @@ Temporary Items @@
     /store/
     surreal
     history.txt
+    /doc/tla/states/