Skip to content

Commit

Permalink
docs: find and replace new instances of master #252
Browse files Browse the repository at this point in the history
  • Loading branch information
MRichards99 committed Mar 17, 2022
1 parent ad0176e commit 9d6f649
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release Build
on:
push:
branches:
- master
- main

jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ to query DataGateway API.
# API Versioning
This repository uses semantic versioning as the standard for version number
incrementing, with the version stored in `pyproject.toml`. There is a GitHub Actions
workflow (`release-build.yml`) which runs when master is updated (i.e. when a pull
workflow (`release-build.yml`) which runs when main is updated (i.e. when a pull
request is merged). This uses
[python-semantic-release](https://github.com/relekang/python-semantic-release) to
determine whether a release needs to be made, and if so, whether a major, minor or patch
Expand Down Expand Up @@ -883,8 +883,8 @@ where possible, as the types are also used to form `CHANGELOG.md`.

New releases are only made when a `fix:` (patch), `feat:` (minor) or `BREAKING CHANGE:`
(major) commit type is found between the previous release and the most recent commit on
master. When the version is bumped, a GitHub tag and release is made which contains
the source code and the built versions of the API (sdist and wheel).
main. When the version is bumped, a GitHub tag and release is made which contains the
source code and the built versions of the API (sdist and wheel).

To check how the version number will be impacted before merging a pull request, use the
following command to show the version which will be made when the GitHub Actions release
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = ["Matthew Richards <matthew.richards@stfc.ac.uk>"]
version_toml = [
"pyproject.toml:tool.poetry.version"
]
branch = "master"
branch = "main"
upload_to_pypi = false
upload_to_release = true
build_command = "pip install poetry==1.1.9 && poetry build"
Expand Down

0 comments on commit 9d6f649

Please sign in to comment.