Merge branch 'main' into next

# Conflicts: # .circleci/config.yml
arangodb · rashtao · May 29, 2025 · May 29, 2025 · May 29, 2025 · May 29, 2025
commit 4a10a7ea69f46d3cc3a18089555bfb6a5d0b1c2e
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -587,6 +587,7 @@ workflows:
             branches:
               only:
                 - main
+                - next
 
   test-non-func:
     when:
-Original file line number
+Diff line change
@@ Expand Up / @@ -587,6 +587,7 @@ workflows: @@
                 branches:
                   only:
                     - main
+                    - next
       test-non-func:
         when:
@@ Expand Down @@