Fix Github action main.yml

iqyx · Apr 6, 2024 · e828c39 · e828c39
1 parent dc3777b
commit e828c39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,10 +21,6 @@ jobs:
 
     - run: |
         git fetch --prune --unshallow --no-recurse-submodules
-        git branch develop
-        git branch -u origin/develop develop
-        git branch master
-        git branch -u origin/master master
 
     - name: Install python venv & dependencies
       run: |

diff --git a/version.SConscript b/version.SConscript
@@ -21,7 +21,12 @@ if str(repo.head.ref)[:8] == "feature/":
 	dev_branch = str(repo.head.ref)
 	dev_feature = dev_branch[8:]
 	dev_tag = [str(tag)[:-4] for tag in repo.tags if str(tag)[-3:] == "dev"][-1]
-	commits_from_develop = len(list(repo.iter_commits("develop..." + dev_branch)))
+	try:
+		commits_from_develop = len(list(repo.iter_commits("develop..." + dev_branch)))
+	except:
+		# local develop branch doesn't exist (most probably)
+		commits_from_develop = len(list(repo.iter_commits("origin/develop..." + dev_branch)))
+
 	v = dev_tag + "-" + dev_feature + ".%s" % commits_from_develop