Merge pull request #265 from slaclab/pre-release

Release Candidate v4.3.6
slaclab · Jul 29, 2022 · b7ba46a · b7ba46a
2 parents 0645d3b + 0f4ca2f
commit b7ba46a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 *.bin
 *.ld
 *.dat
+*.htm
 
 # Matlab
 *.autosave

diff --git a/scripts/firmwareRelease.py b/scripts/firmwareRelease.py
@@ -590,7 +590,7 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev):
             oldTagExist = True
         if str(tagIdx) == ver:
             newTagExist = True
-    if not oldTagExist:
+    if not oldTagExist and (prev != ''):
         raise(Exception(f'local repo: oldTag={prev} does NOT exist'))
     if newTagExist:
         raise(Exception(f'local repo: newTag={ver} already does exist'))
@@ -603,7 +603,7 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev):
             oldTagExist = True
         if tagIdx.name == ver:
             newTagExist = True
-    if not oldTagExist:
+    if not oldTagExist and (prev != ''):
         raise(Exception(f'remote repo: oldTag={prev} does NOT exist'))
     if newTagExist:
         raise(Exception(f'remote repo: newTag={ver} already does exist'))
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
     *.bin
     *.ld
     *.dat
+    *.htm
     # Matlab
     *.autosave
@@ Expand Down @@