Merge pull request #65 from EIT-ALIVE/hotfix_release_workflow

Hotfix release workflow
EIT-ALIVE · Aug 19, 2024 · a3bad7c · a3bad7c
2 parents 9ccccf4 + c0a5b6f
commit a3bad7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Fail if main branch was selected
-        if: ${{ github.ref_name }} == 'main'
+        if: ${{ github.ref_name == 'main' }}
         run: |
           echo "Cannot release from main branch, please select valid release branch."
           exit 1
@@ -34,6 +34,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_PAT }}
+          ref: main
+          fetch-depth: 0
 
       - name: Configure git
         run: |
@@ -44,8 +46,8 @@ jobs:
       - name: Merge changes into main
         run: |
           git switch main
-          git merge ${{ github.ref_name }} --no-ff --no-commit
-          git merge --continue
+          git merge origin/${{ github.ref_name }} --no-ff --no-commit
+          git commit --no-edit
 
       - name: Bump version
         id: bump
@@ -82,6 +84,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_PAT }}
+          fetch-depth: 0
 
       - name: Configure git
         run: |
@@ -105,7 +108,7 @@ jobs:
       - name: Merge updates into develop
         run: |
           git switch develop
-          git merge origin/main
+          git merge --no-ff origin/main
           git push
 
       - name: Delete release branch other than main or develop

diff --git a/eit_dash/utils/common.py b/eit_dash/utils/common.py
@@ -238,7 +238,7 @@ def mark_selected_periods(
                 )
             selected_signal = go.Scatter(**params).to_plotly_json()
 
-            if type(original_figure) == go.Figure:
+            if isinstance(original_figure, go.Figure):
                 original_figure.add_trace(selected_signal)
             else:
                 original_figure["data"].append(selected_signal)