Skip to content

Commit

Permalink
Merge pull request #23 from br3ndonland/master-to-main
Browse files Browse the repository at this point in the history
Rename master branch to main
  • Loading branch information
br3ndonland committed Jan 31, 2021
2 parents a060a4e + c03de3d commit cb94fa1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Expand Up @@ -25,21 +25,21 @@

- **The default branch is `develop`.**
- **PRs should be merged into `develop`.** Head branches are deleted automatically after PRs are merged.
- **The only merges to `master` should be fast-forward merges from `develop`.**
- **Branch protection is enabled on `develop` and `master`.**
- **The only merges to `main` should be fast-forward merges from `develop`.**
- **Branch protection is enabled on `develop` and `main`.**
- `develop`:
- Require signed commits
- Include adminstrators
- Allow force pushes
- `master`:
- `main`:
- Require signed commits
- Include adminstrators
- Do not allow force pushes
- Require status checks to pass before merging (commits must have previously been pushed to `develop` and passed all checks)
- **To create a release:**
- Bump the version number in `pyproject.toml` with `poetry version` and commit the changes to `develop`.
- Push to `develop` and verify all CI checks pass.
- Fast-forward merge to `master`, push, and verify all CI checks pass.
- Fast-forward merge to `main`, push, and verify all CI checks pass.
- Create an [annotated and signed Git tag](https://www.git-scm.com/book/en/v2/Git-Basics-Tagging)
- Follow [SemVer](https://semver.org/) guidelines when choosing a version number.
- List PRs and commits in the tag message:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/builds.yml
Expand Up @@ -3,7 +3,7 @@ name: builds
on:
pull_request:
push:
branches: [develop, master]
branches: [develop, main]
tags:
- "[0-9]+.[0-9]+.[0-9]+*"
workflow_dispatch:
Expand Down Expand Up @@ -73,13 +73,13 @@ jobs:
docker build . --rm --target starlette --build-arg PYTHON_VERSION=${{ matrix.python-version }} -t ghcr.io/br3ndonland/inboard:starlette
docker build . --rm --target fastapi --build-arg PYTHON_VERSION=${{ matrix.python-version }} -t ghcr.io/br3ndonland/inboard:fastapi
- name: Push Docker images with latest Python version to registry
if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' && matrix.python-version == '3.9'
if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' && matrix.python-version == '3.9'
run: |
docker push ghcr.io/br3ndonland/inboard:base
docker push ghcr.io/br3ndonland/inboard:starlette
docker push ghcr.io/br3ndonland/inboard:fastapi
- name: Add Python version tag to Docker images
if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
run: |
docker tag ghcr.io/br3ndonland/inboard:base ghcr.io/br3ndonland/inboard:base-python${{ matrix.python-version }}
docker tag ghcr.io/br3ndonland/inboard:starlette ghcr.io/br3ndonland/inboard:starlette-python${{ matrix.python-version }}
Expand All @@ -104,7 +104,7 @@ jobs:
docker push ghcr.io/br3ndonland/inboard:starlette-"$GIT_TAG"-python${{ matrix.python-version }}
docker push ghcr.io/br3ndonland/inboard:fastapi-"$GIT_TAG"-python${{ matrix.python-version }}
- name: Tag and push latest Docker image
if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
run: |
docker tag ghcr.io/br3ndonland/inboard:fastapi ghcr.io/br3ndonland/inboard:latest
docker push ghcr.io/br3ndonland/inboard:latest
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Expand Up @@ -2,9 +2,9 @@ name: codeql

on:
push:
branches: [develop, master]
branches: [develop, main]
pull_request:
branches: [develop, master]
branches: [develop, main]
schedule:
- cron: "0 13 * * 1"
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hooks.yml
Expand Up @@ -3,7 +3,7 @@ name: hooks
on:
pull_request:
push:
branches: [develop, master]
branches: [develop, main]
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -3,7 +3,7 @@ name: tests
on:
pull_request:
push:
branches: [develop, master]
branches: [develop, main]
paths:
- "**.lock"
- "**.py"
Expand Down

0 comments on commit cb94fa1

Please sign in to comment.