Merge pull request #138 from nicoddemus/adjust-deploy

Fix deploy and update instructions

.github/workflows/deploy.yml

@@ -45,5 +45,5 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        gh release create v${{ github.event.inputs.version }} --target=${{ github.ref_name }} --generate-notes
-        gh merge --branch ${{ github.ref_name }}
+        gh release create v${{ github.event.inputs.version }} --target=${{ github.ref_name }}
+        gh pr merge ${{ github.ref_name }} --merge

RELEASING.rst

@@ -28,6 +28,10 @@ To publish a new release ``X.Y.Z``, the steps are as follows:
 
 #. Commit and push the branch to ``upstream`` and open a PR.
 
-#. Once the PR is **green** and **approved**, start the ``deploy`` workflow manually from the branch ``release-VERSION``, passing ``VERSION`` as parameter.
+#. Once the PR is **green** and **approved**, start the ``deploy`` workflow:
 
-#. Merge the release PR to ``main``.
+   .. code-block:: console
+
+        gh workflow run deploy.yml -R pytest-dev/pytest-subtests --ref release-VERSION --field version=VERSION
+
+   The PR will be automatically merged.