diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e88dee1..257c09d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,13 @@ # Release workflow # -# develop: python-semantic-release on push → semver tag + GitHub Release → sync master +# master: python-semantic-release on push → semver tag + GitHub Release → sync develop name: release on: push: branches: - - develop + - master workflow_dispatch: permissions: @@ -24,7 +24,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: develop + ref: ${{ github.ref_name }} fetch-depth: 0 - name: Reset to workflow SHA @@ -69,8 +69,8 @@ jobs: TAG: ${{ steps.semantic.outputs.tag }} run: gh release view "$TAG" - - name: Sync master from develop + - name: Sync develop from master if: steps.semantic.outputs.released == 'true' run: | - git fetch origin develop - git push origin origin/develop:refs/heads/master + git fetch origin master + git push origin origin/master:refs/heads/develop diff --git a/pyproject.toml b/pyproject.toml index 7b0a1b4..ef00ce7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,10 +54,6 @@ commit_message = "chore(release): {version}" version_toml = ["pyproject.toml:project.version"] version_variables = ["README.md:**Version"] -[tool.semantic_release.branches.develop] -match = "develop" -prerelease = false - [tool.semantic_release.branches.master] match = "master" prerelease = false