Skip to content

Commit

Permalink
👷 Change from master to main in workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
penguineer committed May 26, 2023
1 parent 081d8a0 commit 454faa2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Docker Image
on:
push:
branches:
- 'master'
- 'main'
tags:
- 'v*'
pull_request:
branches:
- 'master'
- 'main'

jobs:
docker:
Expand All @@ -32,17 +32,17 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: PyTest

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down

0 comments on commit 454faa2

Please sign in to comment.