Skip to content

Commit 92b4963

Browse files
Merge pull request #421 from RonnyPfannschmidt/rename/main-followup
docs/ci: follow default-branch rename to main
2 parents 4022a67 + 65c52a8 commit 92b4963

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: test
33
on:
44
push:
55
branches:
6-
- "master"
6+
- "main"
77
- "test-me-*"
88

99
pull_request:
1010
branches:
11-
- "master"
11+
- "main"
1212

1313
# Cancel running jobs for the same workflow and branch.
1414
concurrency:

RELEASING.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This document describes the steps to make a new ``execnet`` release.
77
Version
88
-------
99

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

@@ -22,12 +22,12 @@ Steps
2222

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

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

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

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

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

33-
#. Merge the release PR to ``master``.
33+
#. Merge the release PR to ``main``.

doc/example/test_info.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ sends back the results.
172172
Instantiate gateways through sockets
173173
-----------------------------------------------------
174174

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

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

0 commit comments

Comments
 (0)