resolve merge conflicts

nickjiang2378 · Dec 8, 2024 · 37425a6 · 37425a6
2 parents dcf31f5 + b5e4496
commit 37425a6
Show file tree

Hide file tree

Showing 496 changed files with 27,914 additions and 12,387 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -125,7 +125,7 @@ jobs:
   test:
     name: Test Suite
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.event_name != 'pull_request' }}
-    timeout-minutes: 35
+    timeout-minutes: 50
     needs: pre_job
     runs-on: ${{ matrix.os }}
     strategy:
@@ -199,7 +199,7 @@ jobs:
           source .venv/bin/activate
           pip install maturin
           maturin develop
-      
+
       - name: Build CLI (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -87,7 +87,7 @@ jobs:
           --bump ${{ inputs.bump }} --bump-dependencies auto
           ${{ inputs.execute && '--execute' || '--no-publish' }}
           hydroflow hydroflow_lang hydroflow_macro hydroflow_plus
-          hydroflow_datalog hydroflow_datalog_core
+          hydroflow_plus_std hydroflow_datalog hydroflow_datalog_core
           hydro_deploy hydro_cli hydroflow_deploy_integration
           stageleft stageleft_macro stageleft_tool
           multiplatform_test

diff --git a/.idea/hydroflow.iml b/.idea/hydroflow.iml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,15 @@
             }
         }
     ],
+    "editor.semanticTokenColorCustomizations": {
+        "enabled": true,
+        "rules": {
+            "*.unsafe:rust": {
+                "foreground": "#ea1708",
+                "fontStyle": "bold"
+            }
+        }
+    },
     "files.watcherExclude": {
         "**/target": true
     },