From d717f19db402c683802edc75119e5e95f1bc743c Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 16:52:22 +0200 Subject: [PATCH 01/15] Update release workflow --- .github/workflows/release_github.yml | 60 ++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml index 5e558b237..088b4d5eb 100644 --- a/.github/workflows/release_github.yml +++ b/.github/workflows/release_github.yml @@ -123,12 +123,6 @@ jobs: git config user.name "GitHub Actions" git config -l - - name: Merge branch into main - run: | - git switch main - git branch -f ${{ github.ref_name }} origin/${{ github.ref_name }} - git merge ${{ github.ref_name }} --no-ff --no-edit - - name: Install Python uses: actions/setup-python@v5.1.1 with: @@ -140,7 +134,58 @@ jobs: python3 -m pip install pyproject-deplister pyproject-deplister --extra dev --path pyproject.toml | grep bump-my-version | sed 's/ //g' | xargs -I{} python3 -m pip install "{}" - - name: Pass Inputs to Shell + - name: Merge branch into temp branch + run: | + git checkout -B temp_${{github.ref_name}}_${{github.run_id}} origin/main + git branch -f ${{ github.ref_name }} origin/${{ github.ref_name }} + git merge ${{ github.ref_name }} --no-ff --no-edit + + - name: Bump version + id: temp_bump + shell: bash + run: | + bump-my-version bump ${{ inputs.version_level }} --commit --tag + ([[ $? -gt 0 ]] && echo "bumped=false" || echo "bumped=true") >> $GITHUB_OUTPUT + + - name: Fail if bumping failes + if: steps.temp_bump.outputs.bumped == 'false' + run: | + echo "Bumping failed on temp branch." + git reset --hard HEAD^ + exit 1 + + - name: Get current main commit hash + id: premerge + run: | + git fetch origin main + echo "hash=$(git rev-parse origin/main)" >> $GITHUB_OUTPUT + + - name: Merge PR + run: | + gh pr merge ${{ github.ref_name }} --merge --delete-branch --squash=false + + - name: Wait for main to update + id: waitmain + run: | + for i in {1..10}; do + git fetch origin main + NEW_HASH=$(git rev-parse origin/main) + if [ "$NEW_HASH" != "${{ steps.premerge.outputs.hash }}" ]; then + echo "Main branch updated." + exit 0 + fi + echo "Waiting for main branch to update..." + sleep 6 + done + echo "Timeout: main branch did not update in time." + exit 1 + + - name: Checkout main + run: | + git switch main + git pull origin main + + - name: Bump version id: bump shell: bash run: | @@ -161,6 +206,7 @@ jobs: run: | echo "Version was bumped from ${{ steps.bump.outputs.previous-version }} to ${{ steps.bump.outputs.current-version }}!" + - name: Merge main into develop run: | git checkout develop From 9d6eb73d2c111bf0c6b4250f755ef32a7d97aa34 Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 16:54:05 +0200 Subject: [PATCH 02/15] Remove release PyPi workflow --- .github/workflows/release_pypi.yml | 54 ------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 .github/workflows/release_pypi.yml diff --git a/.github/workflows/release_pypi.yml b/.github/workflows/release_pypi.yml deleted file mode 100644 index 21369470f..000000000 --- a/.github/workflows/release_pypi.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Build and upload to PyPI - -on: - workflow_dispatch: - release: - types: - - published - -jobs: - build: - name: Build universal wheel and source distribution - runs-on: "ubuntu-latest" - - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/install_eitprocessing - with: - dependencies: publishing - extract-data: false - python-version: "3.10" - - name: Build wheel and source distribution - run: python -m build - - uses: actions/upload-artifact@v4 - with: - path: dist/* - - upload_test_pypi: - needs: [build] - runs-on: ubuntu-latest - if: github.event_name == 'workflow_dispatch' - steps: - - uses: actions/download-artifact@v4 - with: - name: artifact - path: dist - - uses: pypa/gh-action-pypi-publish@v1.4.2 - with: - user: __token__ - password: ${{ secrets.TEST_PYPI_TOKEN_ALIVE }} - repository_url: https://test.pypi.org/legacy/ - - upload_pypi: - needs: [build] - runs-on: ubuntu-latest - if: github.event_name == 'release' && github.event.action == 'published' - steps: - - uses: actions/download-artifact@v4 - with: - name: artifact - path: dist - - uses: pypa/gh-action-pypi-publish@v1.4.2 - with: - user: __token__ - password: ${{ secrets.PYPI_TOKEN_ALIVE }} From 6109159304038cc37566960e41179ceac6c65e5f Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 16:54:48 +0200 Subject: [PATCH 03/15] Change line in README.md for testing purposes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2546fcc97..fe3d6f5b4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # EITprocessing -## Introduction +## IntroAduction [Electrical Impedance Tomography](https://en.wikipedia.org/wiki/Electrical_impedance_tomography) (EIT) is a noninvasive and radiation-free continuous imaging tool for monitoring respiratory mechanics. eitprocessing aims to provide a From e17329df1910a7373f343c42b5ff8c142382ac2d Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 16:57:28 +0200 Subject: [PATCH 04/15] Remove dash action workflow --- .github/workflows/dash_actions.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/dash_actions.yml diff --git a/.github/workflows/dash_actions.yml b/.github/workflows/dash_actions.yml deleted file mode 100644 index 644775fbb..000000000 --- a/.github/workflows/dash_actions.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build Dashboard - -on: - push: - branches: - - main - - develop - pull_request: - types: [opened, synchronize, reopened, ready_for_review] - paths-ignore: - - "**.md" - - "**.rst" - - "**.ipynb" - branches: - - main - - develop - -jobs: - call-build-workflow: - if: github.event.pull_request.draft == false - name: Build dashboard - uses: EIT-ALIVE/eit_dash/.github/workflows/build.yml@main - with: - caller_branch: ${{ github.head_ref || github.ref_name }} From 7f77f3f2796a1b349f0645eced2ae74fe26d7841 Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 17:01:28 +0200 Subject: [PATCH 05/15] Remove testing workflow --- .github/workflows/testing.yml | 40 ----------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 .github/workflows/testing.yml diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml deleted file mode 100644 index 39f979056..000000000 --- a/.github/workflows/testing.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build and Test - -on: - push: - branches: - - main - - develop - pull_request: - types: [opened, synchronize, reopened, ready_for_review] - paths-ignore: - - "**.md" - - "**.rst" - - "**.ipynb" - branches: - - main - - develop - -jobs: - test_and_build: - if: github.event.pull_request.draft == false - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] - python-version: ["3.10"] - name: Test and build for ${{ matrix.python-version }}, ${{ matrix.os }} - env: - EIT_PROCESSING_TEST_DATA: ${{ github.workspace }}/../eitprocessing_data/ - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/install_eitprocessing - with: - dependencies: testing - extract-data: true - python-version: ${{ matrix.python-version }} - token: ${{ secrets.GITHUB_TOKEN }} - data-directory: ${{ env.EIT_PROCESSING_TEST_DATA }} - - name: Run pytest - run: pytest -v From 66b66b3bf69072d2e3af5dd33b01601e2a4a62e0 Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 17:03:52 +0200 Subject: [PATCH 06/15] Remove tests from github release workflow --- .github/workflows/release_github.yml | 34 ---------------------------- 1 file changed, 34 deletions(-) diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml index 088b4d5eb..9fe254e9d 100644 --- a/.github/workflows/release_github.yml +++ b/.github/workflows/release_github.yml @@ -68,42 +68,8 @@ jobs: gh pr checks ${{ github.ref_name }} --watch --fail-fast gh pr checks ${{ github.ref_name }} --json state -q 'if . | length == 0 then "No checks found." elif map(.state == "SUCCESS") | all then "All checks passed" else error("Not all checks passed") end' - test_python_releases: - needs: checks - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] - python-version: ["3.10", "3.11", "3.12", "3.13"] - name: Build for ${{ matrix.python-version }}, ${{ matrix.os }} - env: - EIT_PROCESSING_TEST_DATA: ${{ github.workspace }}/../eitprocessing_data/ - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Install eitprocessing - uses: ./.github/actions/install_eitprocessing - with: - dependencies: testing - extract-data: true - python-version: ${{ matrix.python-version }} - token: ${{ secrets.GITHUB_TOKEN }} - data-directory: ${{ env.EIT_PROCESSING_TEST_DATA }} - - - name: Run pytest - run: pytest -v --runslow - - - name: Install additional dependencies for building - run: python3 -m pip install --upgrade ".[publishing]" - - - name: Build eitprocessing - run: python3 -m build - merge_and_bump: name: Merge the changes into main and bump the version - needs: test_python_releases runs-on: ubuntu-latest outputs: new-version: ${{ steps.bump.outputs.current-version }} From b40c41d634ffd8db232e7a9850ae36d6818b8fa3 Mon Sep 17 00:00:00 2001 From: GitHub Actions <127968566+psomhorst@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:04:44 +0000 Subject: [PATCH 07/15] =?UTF-8?q?Bump=20version:=201.8.3=20=E2=86=92=201.9?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CITATION.cff | 2 +- eitprocessing/__init__.py | 2 +- pyproject.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 434fb880b..d26f22c03 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -39,7 +39,7 @@ authors: date-released: 2023-03-23 doi: 10.5281/zenodo.7869553 -version: "1.8.3" +version: "1.9.0" repository-code: "https://github.com/EIT-ALIVE/eitprocessing" keywords: - Mechanical lung ventilation diff --git a/eitprocessing/__init__.py b/eitprocessing/__init__.py index a44132de1..0a0a43a57 100644 --- a/eitprocessing/__init__.py +++ b/eitprocessing/__init__.py @@ -1 +1 @@ -__version__ = "1.8.3" +__version__ = "1.9.0" diff --git a/pyproject.toml b/pyproject.toml index f807f3562..0848d7f15 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "eitprocessing" -version = "1.8.3" +version = "1.9.0" description = "Processing of lung image data from electrical impedance tomography." readme = "README.md" requires-python = ">=3.10" @@ -174,7 +174,7 @@ isort.known-first-party = ["eitprocessing"] "docs/*" = ["ALL"] [tool.bumpversion] -current_version = "1.8.3" +current_version = "1.9.0" [[tool.bumpversion.files]] filename = "pyproject.toml" From 2a22ba6778c10a2ed6515bfba5904d01452f8235 Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 17:12:52 +0200 Subject: [PATCH 08/15] Fix workflow --- .github/workflows/release_github.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml index 9fe254e9d..43e6bd21e 100644 --- a/.github/workflows/release_github.yml +++ b/.github/workflows/release_github.yml @@ -70,6 +70,7 @@ jobs: merge_and_bump: name: Merge the changes into main and bump the version + needs: checks runs-on: ubuntu-latest outputs: new-version: ${{ steps.bump.outputs.current-version }} @@ -110,7 +111,7 @@ jobs: id: temp_bump shell: bash run: | - bump-my-version bump ${{ inputs.version_level }} --commit --tag + bump-my-version bump ${{ inputs.version_level }} --commit --no-tag ([[ $? -gt 0 ]] && echo "bumped=false" || echo "bumped=true") >> $GITHUB_OUTPUT - name: Fail if bumping failes @@ -120,6 +121,13 @@ jobs: git reset --hard HEAD^ exit 1 + - name: Fail if bumping failes + if: steps.temp_bump.outputs.bumped == 'true' + run: | + echo "Version would be bumped to $(bump-my-version show current_version)!" + + git reset --hard HEAD^ + - name: Get current main commit hash id: premerge run: | From b10710451a434958347a97a819099e6319362f3c Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 17:14:11 +0200 Subject: [PATCH 09/15] Remove action to remove PR branch --- .github/workflows/release_github.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml index 43e6bd21e..a4e151f3a 100644 --- a/.github/workflows/release_github.yml +++ b/.github/workflows/release_github.yml @@ -223,21 +223,3 @@ jobs: --title="Release v${{ needs.merge_and_bump.outputs.new-version }}" \ --generate-notes \ --draft - - remove_branch: - name: Remove PR branch - needs: github_release - if: ${{ github.ref_name != 'develop' }} - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - ref: develop - fetch-depth: 0 - - - name: Remove PR branch - uses: dawidd6/action-delete-branch@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branches: ${{ github.ref_name }} From e53be64b1569cbb6b5a95dd212c2a7ab5d85589e Mon Sep 17 00:00:00 2001 From: GitHub Actions <127968566+psomhorst@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:17:23 +0000 Subject: [PATCH 10/15] =?UTF-8?q?Bump=20version:=201.9.0=20=E2=86=92=201.9?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CITATION.cff | 2 +- eitprocessing/__init__.py | 2 +- pyproject.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index d26f22c03..4fab54fe6 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -39,7 +39,7 @@ authors: date-released: 2023-03-23 doi: 10.5281/zenodo.7869553 -version: "1.9.0" +version: "1.9.1" repository-code: "https://github.com/EIT-ALIVE/eitprocessing" keywords: - Mechanical lung ventilation diff --git a/eitprocessing/__init__.py b/eitprocessing/__init__.py index 0a0a43a57..38cf6dbeb 100644 --- a/eitprocessing/__init__.py +++ b/eitprocessing/__init__.py @@ -1 +1 @@ -__version__ = "1.9.0" +__version__ = "1.9.1" diff --git a/pyproject.toml b/pyproject.toml index 0848d7f15..496ee72f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "eitprocessing" -version = "1.9.0" +version = "1.9.1" description = "Processing of lung image data from electrical impedance tomography." readme = "README.md" requires-python = ">=3.10" @@ -174,7 +174,7 @@ isort.known-first-party = ["eitprocessing"] "docs/*" = ["ALL"] [tool.bumpversion] -current_version = "1.9.0" +current_version = "1.9.1" [[tool.bumpversion.files]] filename = "pyproject.toml" From c2364caa272ed31db776df3dc9dfd3ee24b28e8b Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Mon, 15 Sep 2025 17:19:10 +0200 Subject: [PATCH 11/15] . --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe3d6f5b4..b307d2400 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # EITprocessing -## IntroAduction +## IntroCduction [Electrical Impedance Tomography](https://en.wikipedia.org/wiki/Electrical_impedance_tomography) (EIT) is a noninvasive and radiation-free continuous imaging tool for monitoring respiratory mechanics. eitprocessing aims to provide a From bc2363df0f873ac377cd50fa5fa4787904573fda Mon Sep 17 00:00:00 2001 From: GitHub Actions <127968566+psomhorst@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:22:20 +0000 Subject: [PATCH 12/15] =?UTF-8?q?Bump=20version:=201.9.1=20=E2=86=92=201.9?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CITATION.cff | 2 +- eitprocessing/__init__.py | 2 +- pyproject.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 4fab54fe6..cdd57db4e 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -39,7 +39,7 @@ authors: date-released: 2023-03-23 doi: 10.5281/zenodo.7869553 -version: "1.9.1" +version: "1.9.2" repository-code: "https://github.com/EIT-ALIVE/eitprocessing" keywords: - Mechanical lung ventilation diff --git a/eitprocessing/__init__.py b/eitprocessing/__init__.py index 38cf6dbeb..2cbc28c30 100644 --- a/eitprocessing/__init__.py +++ b/eitprocessing/__init__.py @@ -1 +1 @@ -__version__ = "1.9.1" +__version__ = "1.9.2" diff --git a/pyproject.toml b/pyproject.toml index 496ee72f5..2649bc523 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "eitprocessing" -version = "1.9.1" +version = "1.9.2" description = "Processing of lung image data from electrical impedance tomography." readme = "README.md" requires-python = ">=3.10" @@ -174,7 +174,7 @@ isort.known-first-party = ["eitprocessing"] "docs/*" = ["ALL"] [tool.bumpversion] -current_version = "1.9.1" +current_version = "1.9.2" [[tool.bumpversion.files]] filename = "pyproject.toml" From 0cef5e8161ad25d50bf70cdbe4b86b63bb305af3 Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Tue, 16 Sep 2025 15:37:57 +0200 Subject: [PATCH 13/15] Change main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b307d2400..ffcbe734f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # EITprocessing -## IntroCduction +## Introcduction main [Electrical Impedance Tomography](https://en.wikipedia.org/wiki/Electrical_impedance_tomography) (EIT) is a noninvasive and radiation-free continuous imaging tool for monitoring respiratory mechanics. eitprocessing aims to provide a From 994748b25d95decde0b3e7d5d84e0a26cbb6182c Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Tue, 16 Sep 2025 15:39:20 +0200 Subject: [PATCH 14/15] Remove workflows --- .github/workflows/coverage.yml | 36 ------------------ .../workflows/test_build_documentation.yml | 38 ------------------- 2 files changed, 74 deletions(-) delete mode 100644 .github/workflows/coverage.yml delete mode 100644 .github/workflows/test_build_documentation.yml diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml deleted file mode 100644 index 99e3bd750..000000000 --- a/.github/workflows/coverage.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Coverage - -on: - push: - branches: - - main - - develop - -jobs: - coveralls: - name: Coveralls - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] - python-version: ["3.10"] - env: - EIT_PROCESSING_TEST_DATA: ${{ github.workspace }}/../eitprocessing_data/ - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_FLAG_NAME: python-${{ matrix.python-version }} - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/install_eitprocessing - with: - dependencies: testing - extract-data: true - python-version: ${{ matrix.python-version }} - token: ${{ secrets.GITHUB_TOKEN }} - data-directory: ${{ env.EIT_PROCESSING_TEST_DATA }} - - name: Run coveralls - run: | - pytest --cov --cov-report xml --cov-report term --cov-report html - git config --global --add safe.directory /ci - coveralls --service=github diff --git a/.github/workflows/test_build_documentation.yml b/.github/workflows/test_build_documentation.yml deleted file mode 100644 index 425e9ee54..000000000 --- a/.github/workflows/test_build_documentation.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Documentation - -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened, ready_for_review] - branches: - - main - - develop - -jobs: - build-docs: - if: github.event.pull_request.draft == false - name: Build documentation - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_PAT }} - - uses: ./.github/actions/install_eitprocessing - with: - dependencies: docs - extract-data: false - python-version: "3.10" - - name: Link notebooks - run: ln -s ../../notebooks docs/examples - - name: Build documentation - if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/main') }} - run: mkdocs build - - name: Build and deploy documentation - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} - run: | - git config --local user.email "github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - mike deploy --push --update-aliases $(git describe --tags --abbrev=0 | sed -E 's/^([vV]?[0-9]+\.[0-9]+).*/\1/') latest From 44d4388899f06e7d0854df579ca4716840311ad3 Mon Sep 17 00:00:00 2001 From: Peter Somhorst <> Date: Tue, 16 Sep 2025 15:45:25 +0200 Subject: [PATCH 15/15] Test merge into develop --- .github/workflows/release_github.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml index a4e151f3a..27c01f666 100644 --- a/.github/workflows/release_github.yml +++ b/.github/workflows/release_github.yml @@ -101,12 +101,17 @@ jobs: python3 -m pip install pyproject-deplister pyproject-deplister --extra dev --path pyproject.toml | grep bump-my-version | sed 's/ //g' | xargs -I{} python3 -m pip install "{}" - - name: Merge branch into temp branch + - name: Test merging PR into main, and main into develop run: | - git checkout -B temp_${{github.ref_name}}_${{github.run_id}} origin/main + git fetch origin main + git checkout -B temp_main_${{github.ref_name}}_${{github.run_id}} origin/main git branch -f ${{ github.ref_name }} origin/${{ github.ref_name }} git merge ${{ github.ref_name }} --no-ff --no-edit + git fetch origin develop + git checkout -B temp_develop_${{github.ref_name}}_${{github.run_id}} origin/develop + git merge temp_main_${{github.ref_name}}_${{github.run_id}} + - name: Bump version id: temp_bump shell: bash @@ -121,11 +126,10 @@ jobs: git reset --hard HEAD^ exit 1 - - name: Fail if bumping failes + - name: Succeed if version is bumped if: steps.temp_bump.outputs.bumped == 'true' run: | echo "Version would be bumped to $(bump-my-version show current_version)!" - git reset --hard HEAD^ - name: Get current main commit hash