From 1e713e95fe60ec700b53524cf2fd70d39998df39 Mon Sep 17 00:00:00 2001 From: Ash Holland Date: Fri, 1 Oct 2021 23:10:55 +0100 Subject: [PATCH] Change default branch name to "main" --- .github/workflows/main.yml | 6 +++--- README.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f3e452..a3531a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main pull_request: types: [opened, synchronize] @@ -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 diff --git a/README.rst b/README.rst index 7fd9d50..1d8a57a 100644 --- a/README.rst +++ b/README.rst @@ -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 @@ -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/ \ No newline at end of file +.. _Watchtower: https://containrrr.github.io/watchtower/