Merge branch 'master' into quic

vacp2p · Sep 2, 2024 · beaed7c · beaed7c
2 parents e61a190 + 70754cd
commit beaed7c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/.github/workflows/daily_common.yml b/.github/workflows/daily_common.yml
@@ -17,6 +17,11 @@ on:
         required: false
         type: string
         default: "[]"
+      use_sat_solver:
+        description: 'Install dependencies with SAT Solver'
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -86,4 +91,12 @@ jobs:
         run: |
           nim --version
           nimble --version
-          NIMFLAGS="${NIMFLAGS} --mm:${{ matrix.nim.memory_management }}" nimble test
+
+          if [[ "${{ inputs.use_sat_solver }}" == "true" ]]; then
+            dependency_solver="sat"
+          else
+            dependency_solver="legacy"
+          fi
+
+          NIMFLAGS="${NIMFLAGS} --mm:${{ matrix.nim.memory_management }} --solver:${dependency_solver}"
+          nimble test
diff --git a/.github/workflows/daily_sat.yml b/.github/workflows/daily_sat.yml
@@ -0,0 +1,15 @@
+name: Daily SAT
+
+on:
+  schedule:
+    - cron: "30 6 * * *"
+  workflow_dispatch:
+
+jobs:
+  test_amd64:
+    name: Daily SAT
+    uses: ./.github/workflows/daily_common.yml
+    with:
+      nim: "[{'branch': 'version-2-0', 'memory_management': 'refc'}]"
+      cpu: "['amd64']"
+      use_sat_solver: true
diff --git a/libp2p/transports/wstransport.nim b/libp2p/transports/wstransport.nim
@@ -56,7 +56,7 @@ proc new*(
   stream.initStream()
   return stream
 
-template mapExceptions(body: untyped) =
+template mapExceptions(body: untyped): untyped =
   try:
     body
   except AsyncStreamIncompleteError: