Skip to content

Commit

Permalink
Merge pull request #47 from YakDriver/newdefault
Browse files Browse the repository at this point in the history
Update default branch to main
  • Loading branch information
YakDriver authored Jul 20, 2020
2 parents 3f8a494 + 734ccea commit c043025
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
ref: master
ref: main
- name: Check commits since last release
id: count-commits
run: |
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
ref: master
ref: main
- name: Bump version
uses: actions/setup-python@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
cleanup: false
upload_docs: false
on:
branch: master
branch: main
- provider: pypi
distributions: sdist bdist_wheel
username: __token__
Expand All @@ -69,7 +69,7 @@ jobs:
on:
tags: true
- stage: deploy
if: branch = master AND tag IS blank
if: branch = main AND tag IS blank
python: 3.6
install: skip
script:
Expand All @@ -89,5 +89,5 @@ jobs:
token:
secure: "Sm1sNSVGUFDb+bZjNvIiH65r28Y83q2invQop9qW2iSDQaEiOLQT7JKzeSUZJxjzq824aK2aU8se9f8wkKwlTaVGjou5tCRUncsPf8biFKgJSUKl0SEYCJ3Dzff8xi+Mk2bOOUo3VgnDTKdNtQ62dzJOrI2mLZ7dymSf8e5LBHjbSNzVPE+KOm7/8LERgyO7hGbuU8AYK2ixZI7Ltm2MYFu88KH2o31wQPflNmCqpIqNP8IrE1tW//IcLKrvArrC0N4nOD8/I8bvb2uLVsaolruC+P+ohlIuksfeqB4XXQxRuNHZDJU9QExrhY3gzZOGm5B8ucj71H56W/3DgD0RV9pT0BAWynHUhtSCCLI4MCaTVq2jAVkjgnpO1rzbauYoXHQenZZNoyJ+l6bHF2Uz9oC8IwtEe6EiJ1TwnFHMvWtG3PVm4d9xuirl1E+xKi4mYQ/WwnNmOcYEGxtLIeduV51bqZYi3CxADxv51+KOpDJMSv3+eQcnUgtGozNqCFzaL2Lnl1RYWQLTAHBBxXl91tprunsno5usMok8sGz5JJ7f/+U53gTZitzpXYS6qTyGcZbde6HOAH/vJzpoI32VbaLWfNrcTwFpVVehFYPW6hdUgmCTGehGCqWkRtMdJkyt3MhJ0PRco0lU0YQ77ZO/6Yqv+Rg8g0iJQYIr5QG3KeY="
on:
branch: master
branch: main
condition: '"$PRIOR_VERSION" != "$RELEASE_VERSION"'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<a href="./LICENSE" alt="License">
<img src="https://img.shields.io/github/license/YakDriver/oschmod.svg" /></a>
<a href="http://travis-ci.org/YakDriver/oschmod" alt="Build status">
<img src="https://travis-ci.org/YakDriver/oschmod.svg?branch=master" /></a>
<img src="https://travis-ci.org/YakDriver/oschmod.svg?branch=main" /></a>
<a href="https://pypi.python.org/pypi/oschmod" alt="Python versions">
<img src="https://img.shields.io/pypi/pyversions/oschmod.svg" /></a>
<a href="https://pypi.python.org/pypi/oschmod" alt="Version">
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
trigger:
- master
- main

pool:
vmImage: 'windows-latest'
Expand Down

0 comments on commit c043025

Please sign in to comment.