Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix release workflow #65

Merged
merged 4 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/release_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -34,6 +34,8 @@ jobs:
uses: actions/checkout@v4
with:
token: ${{ secrets.GH_PAT }}
ref: main
fetch-depth: 0

- name: Configure git
run: |
Expand All @@ -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
Expand Down Expand Up @@ -82,6 +84,7 @@ jobs:
uses: actions/checkout@v4
with:
token: ${{ secrets.GH_PAT }}
fetch-depth: 0

- name: Configure git
run: |
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eit_dash/utils/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading