Skip to content

Commit

Permalink
Merge pull request #180 from HackSoc/default-branch
Browse files Browse the repository at this point in the history
Change default branch name to "main"
  • Loading branch information
alanbriolat committed Feb 14, 2022
2 parents 892c9e6 + 1e713e9 commit 04f0cca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
types: [opened, synchronize]

Expand Down Expand Up @@ -56,14 +56,14 @@ jobs:
- name: Run tests inside Docker
run: docker run --rm csbot:latest pytest
- name: Login to GitHub Packages
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: docker/login-action@v1
with:
registry: docker.pkg.github.com
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Docker image
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: docker/build-push-action@v2
with:
push: true
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ We're also using GitHub Actions for continuous integration and continuous deploy

.. image:: https://github.com/HackSoc/csbot/actions/workflows/main.yml/badge.svg

.. image:: https://codecov.io/gh/HackSoc/csbot/branch/master/graph/badge.svg?token=oMJcY9E9lj
.. image:: https://codecov.io/gh/HackSoc/csbot/branch/main/graph/badge.svg?token=oMJcY9E9lj
:target: https://codecov.io/gh/HackSoc/csbot


Expand All @@ -89,4 +89,4 @@ We're also using GitHub Actions for continuous integration and continuous deploy
.. _lxml: http://lxml.de/
.. _Docker Compose: https://docs.docker.com/compose/
.. _published image: https://hub.docker.com/r/alanbriolat/csbot
.. _Watchtower: https://containrrr.github.io/watchtower/
.. _Watchtower: https://containrrr.github.io/watchtower/

0 comments on commit 04f0cca

Please sign in to comment.