Attempt using merge into master insted #296

	name: publish

	permissions:
	contents: write

	on:
	push

	jobs:
	publish-tag:
	if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
	runs-on: ubuntu-latest
	strategy:
	max-parallel: 1
	matrix:
	python-version: ['3.10']

	steps:
	- uses: actions/checkout@v4
	with:
	fetch-depth: 0
	ref: bump-version

	- name: Set up Python ${{ matrix.python-version }}
	uses: actions/setup-python@v5
	with:
	python-version: ${{ matrix.python-version }}

	# Avoid caching to be 100% confident things are working properly
	- name: Init python poetry action
	uses: abatilo/[email protected]
	with:
	poetry-version: 1.5.1

	- name: Install dependencies
	run: poetry install -E session

	- name: Check that formatting, linting, and tests pass for pydantic v1
	run: poetry run make ci-v1
	- name: Check that formatting, linting, and tests pass for pydantic v2
	run: poetry run make ci-v2

	- name: Build distribution
	run: poetry build

	- name: Configure git user
	run: \|
	git config --global user.name 'BumpVersion[CI]'
	git config --global user.email '[email protected]'

	- name: Bump to version
	run: poetry run make version version=${{ github.ref_name }}

	- name: Commit new version
	run: \|
	git commit -am "Update version to ${{ github.ref_name }}"
	git push

	- name: Merge into master
	run: \|
	git checkout master
	git pull
	git merge origin/bump-version
	git push

	- name: Publish distribution to PyPI
	run: \|
	echo "will publish ${poetry version}"
	env:
	POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}

Provide feedback