Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: test
on:
push:
branches:
- "master"
- "main"
- "test-me-*"

pull_request:
branches:
- "master"
- "main"

# Cancel running jobs for the same workflow and branch.
concurrency:
Expand Down
6 changes: 3 additions & 3 deletions RELEASING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This document describes the steps to make a new ``execnet`` release.
Version
-------

``master`` should always be green and a potential release candidate. ``execnet`` follows
``main`` should always be green and a potential release candidate. ``execnet`` follows
semantic versioning, so given that the current version is ``X.Y.Z``, to find the next version number
one needs to look at the ``CHANGELOG.rst`` file:

Expand All @@ -22,12 +22,12 @@ Steps

To publish a new release ``X.Y.Z``, the steps are as follows:

#. Create a new branch named ``release-X.Y.Z`` from the latest ``master``.
#. Create a new branch named ``release-X.Y.Z`` from the latest ``main``.

#. Update the ``CHANGELOG.rst`` file with the new release information.

#. 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.

#. Merge the release PR to ``master``.
#. Merge the release PR to ``main``.
2 changes: 1 addition & 1 deletion doc/example/test_info.rst
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ sends back the results.
Instantiate gateways through sockets
-----------------------------------------------------

.. _`socketserver.py`: https://raw.githubusercontent.com/pytest-dev/execnet/master/execnet/script/socketserver.py
.. _`socketserver.py`: https://raw.githubusercontent.com/pytest-dev/execnet/main/src/execnet/script/socketserver.py

In cases where you do not have SSH-access to a machine
you need to download a small version-independent standalone
Expand Down