Skip to content

Commit

Permalink
chore: rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
czosel committed Feb 11, 2022
1 parent fa0159c commit 7287f1e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
# Run build for any PRs - we won't push in those however
pull_request:
branches:
- master
- main

# Publish `master` as Docker `latest` image.
# Publish `main` as Docker `latest` image.
push:
branches:
- master
- main

env:
IMAGE_NAME: emeis
Expand Down Expand Up @@ -47,8 +47,8 @@ jobs:
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
if [[ "$VERSION" == "master" ]]; then
# only push "dev" image from master branch build
if [[ "$VERSION" == "main" ]]; then
# only push "dev" image from main branch build
echo "Pushing $IMAGE_ID:dev"
docker tag $IMAGE_NAME $IMAGE_ID:dev
docker push $IMAGE_ID:dev
Expand Down
4 changes: 2 additions & 2 deletions MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Here is a rough outline / checklist for the release (explained further below):

1. Checkout `master` branch, ensure you have all tags
1. Checkout `main` branch, ensure you have all tags
2. Prepare changelog
3. Figure out the next version
4. Update code (CHANGELOG, version info)
Expand All @@ -21,7 +21,7 @@ checklist:

```bash
# Ensure you're on the current main and have all release tags
git checkout master
git checkout main
git pull origin --tags

# Prepare changelog
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# emeis

[![Build Status](https://github.com/projectcaluma/emeis/workflows/Tests/badge.svg)](https://github.com/projectcaluma/emeis/actions?query=workflow%3ATests)
[![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen.svg)](https://github.com/projectcaluma/emeis/blob/master/setup.cfg#L50)
[![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen.svg)](https://github.com/projectcaluma/emeis/blob/main/setup.cfg#L50)
[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/projectcaluma/emeis)
[![License: GPL-3.0-or-later](https://img.shields.io/github/license/projectcaluma/emeis)](https://spdx.org/licenses/GPL-3.0-or-later.html)

Expand Down Expand Up @@ -97,7 +97,7 @@ This should always be `false` in production environments.
* docker
* docker-compose

After installing and configuring those, download [docker-compose.yml](https://raw.githubusercontent.com/projectcaluma/emeis/master/docker-compose.yml) and run the following command:
After installing and configuring those, download [docker-compose.yml](https://raw.githubusercontent.com/projectcaluma/emeis/main/docker-compose.yml) and run the following command:

```bash
# only needs to be run once
Expand Down

0 comments on commit 7287f1e

Please sign in to comment.