Merge remote-tracking branch 'upstream/master' into fix/1221-vpn-peer-cache-desync

mn-ram · mn-ram · commit d8072fc5c261 · 2026-03-15T15:35:31.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,7 +88,9 @@ jobs:
 
       - name: Show gecko web driver log on failures
         if: ${{ failure() }}
-        run: cat geckodriver.log
+        run: |
+          [ -f geckodriver.log ] && cat geckodriver.log \
+            || echo "there is no gecko web driver log to show"
 
       - name: Upload Coverage
         if: ${{ success() }}
diff --git a/openwisp_controller/geo/tasks.py b/openwisp_controller/geo/tasks.py
@@ -0,0 +1,3 @@
+from .estimated_location.tasks import (  # noqa: F401 - support autodiscovering
+    manage_estimated_locations,
+)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from .estimated_location.tasks import ( # noqa: F401 - support autodiscovering`
	`2`	`+ manage_estimated_locations,`
	`3`	`+)`