Bug/SK-680 | Android helper imports helper base incorrectly (#525)

* Fixed import * Branch name check - added bug & refator
scaleoutsystems · Feb 7, 2024 · 9094238 · 9094238
1 parent 518c787
commit 9094238
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/branch-name-check.yaml b/.github/workflows/branch-name-check.yaml
@@ -7,7 +7,7 @@ on:
       - master
 
 env:
-  BRANCH_REGEX: '^((feature|hotfix|bugfix|docs)\/.+)|(release\/v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$'
+  BRANCH_REGEX: '^((feature|hotfix|bugfix|bug|docs|refactor)\/.+)|(release\/v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$'
 
 jobs:
   branch-name-check:

diff --git a/fedn/fedn/utils/helpers/plugins/androidhelper.py b/fedn/fedn/utils/helpers/plugins/androidhelper.py
@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from .helperbase import HelperBase
+from fedn.utils.helpers.helperbase import HelperBase
 
 
 class Helper(HelperBase):
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ on: @@
           - master
     env:
-      BRANCH_REGEX: '^((feature|hotfix|bugfix|docs)\/.+)|(release\/v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$'
+      BRANCH_REGEX: '^((feature|hotfix|bugfix|bug|docs|refactor)\/.+)|(release\/v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?))$'
     jobs:
       branch-name-check:
@@ Expand Down @@