Skip to content

Commit c2ccbfb

Browse files
committed
Fix deploy and update instructions
1 parent 358790b commit c2ccbfb

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ jobs:
4545
env:
4646
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747
run: |
48-
gh release create v${{ github.event.inputs.version }} --target=${{ github.ref_name }} --generate-notes
49-
gh merge --branch ${{ github.ref_name }}
48+
gh release create v${{ github.event.inputs.version }} --target=${{ github.ref_name }}
49+
gh pr merge ${{ github.ref_name }} --merge

RELEASING.rst

+6-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ To publish a new release ``X.Y.Z``, the steps are as follows:
2828

2929
#. Commit and push the branch to ``upstream`` and open a PR.
3030

31-
#. Once the PR is **green** and **approved**, start the ``deploy`` workflow manually from the branch ``release-VERSION``, passing ``VERSION`` as parameter.
31+
#. Once the PR is **green** and **approved**, start the ``deploy`` workflow:
3232

33-
#. Merge the release PR to ``main``.
33+
.. code-block:: console
34+
35+
gh workflow run deploy.yml -R pytest-dev/pytest-subtests --ref release-VERSION --field version=VERSION
36+
37+
The PR will be automatically merged.

0 commit comments

Comments
 (0)