Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename default branch #175

Merged
merged 3 commits into from
Nov 16, 2022
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/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: build docs
on:
push:
branches:
- 'master'
- 'main'
- 'release/*'
tags:
- 'v*'
Expand All @@ -25,7 +25,7 @@ jobs:
env:
DISPLAY: ':99.0'
OS: ${{ matrix.os }}
UPLOAD_TO_GHPAGES: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
UPLOAD_TO_GHPAGES: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
steps:
- uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Run mypy and pytest
on:
push:
branches:
- 'master'
- 'main'
- 'release/*'
- 'staging'
- 'trying'
Expand Down
9 changes: 9 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ This repository contains QCoDeS instrument drivers developed by members of the Q
These drivers are not supported by the QCoDeS developers but instead supported on a best effort basis
by the developers of the individual drivers.

Default branch is now main
##########################

The default branch in qcodes_contrib_drivers has been remamed to main.
If you are working with a local clone of qcodes_contrib_drivers you should update it as follows.

* Run ``git fetch origin`` and ``git checkout main``
* Run ``git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main`` to update your HEAD reference.

Getting started
###############

Expand Down