Skip to content

Commit

Permalink
Merge pull request #471 from hugovk/main-to-master
Browse files Browse the repository at this point in the history
Rename master to main
  • Loading branch information
hugovk committed Sep 5, 2021
2 parents 7fb005a + 7ac9860 commit f7dc48a
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Expand Up @@ -3,7 +3,7 @@ name: Benchmark
on:
push:
branches:
- master
- main

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-wheels.yml
Expand Up @@ -6,7 +6,7 @@ name: Deploy wheels
on:
push:
branches:
- master
- main
release:
types:
- published
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Expand Up @@ -3,7 +3,7 @@ name: Deploy
on:
push:
branches:
- master
- main
release:
types:
- published
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Expand Up @@ -2,7 +2,7 @@ name: Sync labels
on:
push:
branches:
- master
- main
paths:
- .github/labels.yml
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Expand Up @@ -4,14 +4,14 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master
- main

jobs:
update_release_draft:
if: github.repository == 'ultrajson/ultrajson'
runs-on: ubuntu-latest
steps:
# Drafts your next release notes as pull requests are merged into "master"
# Drafts your next release notes as pull requests are merged into "main"
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -17,7 +17,7 @@ UltraJSON
:alt: GitHub Actions status
:target: https://github.com/ultrajson/ultrajson/actions?query=workflow%3ATest

.. image:: https://travis-ci.com/ultrajson/ultrajson.svg?branch=master
.. image:: https://travis-ci.com/ultrajson/ultrajson.svg?branch=main
:alt: Travis CI status
:target: https://travis-ci.com/ultrajson/ultrajson

Expand Down
6 changes: 3 additions & 3 deletions RELEASING.md
@@ -1,11 +1,11 @@
# Release Checklist

- [ ] Get master to the appropriate code release state.
- [ ] Get `main` to the appropriate code release state.
[GitHub Actions](https://github.com/ultrajson/ultrajson/actions) and
[Travis CI](https://travis-ci.com/ultrajson/ultrajson) should be running
cleanly for all merges to master.
cleanly for all merges to `main`.
[![GitHub Actions status](https://github.com/ultrajson/ultrajson/workflows/Test/badge.svg)](https://github.com/ultrajson/ultrajson/actions)
[![Build Status](https://travis-ci.org/ultrajson/ultrajson.svg?branch=master)](https://travis-ci.org/ultrajson/ultrajson)
[![Build Status](https://travis-ci.org/ultrajson/ultrajson.svg?branch=main)](https://travis-ci.org/ultrajson/ultrajson)

- [ ] Edit release draft, adjust text if needed: https://github.com/ultrajson/ultrajson/releases

Expand Down

0 comments on commit f7dc48a

Please sign in to comment.