Make lock conflicts revert to main initially
@@ -42,9 +42,7 @@ jobs:
- name: Install PyMedPhys with propagate environment
if: steps.conflicts.outputs.status == 'true'
run: |
- poetry install -E propagate
- pip install pipx
- pipx install poetry-merge-lock
+ poetry install -E propagate || poetry lock --no-updates && poetry install -E propagate
- name: Fix conflicts
if: steps.conflicts.outputs.status == 'true'
@@ -55,7 +53,7 @@ jobs:
git fetch origin main
git merge origin/main || true
- poetry run pymedphys dev propagate || poetry-merge-lock && poetry run pymedphys dev propagate
+ poetry run pymedphys dev propagate || git checkout main poetry.lock && poetry run pymedphys dev propagate
git add poetry.lock setup.py requirements* pyproject.hash
git commit -m "Merge origin/main, fix merge conflicts from 'pymedphys dev propagate'"
