diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2516bc9..d33b6a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,12 @@ name: CI on: push: - branches: [master] + branches: [main] paths-ignore: - 'README.md' - 'docs/**' pull_request: - branches: [master] + branches: [main] paths-ignore: - 'README.md' - 'docs/**' @@ -76,7 +76,7 @@ jobs: DOCKERHUB_REPOSITORY: peterevans/dd-ci-fixture-${{ matrix.target }} package: - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' needs: [test] runs-on: ubuntu-latest steps: @@ -91,7 +91,7 @@ jobs: commit-message: 'build: update distribution' title: Update distribution body: | - - Updates the distribution for changes on `master` + - Updates the distribution for changes on `main` Auto-generated by [create-pull-request][1] diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml index 7b689ff..3983c7c 100644 --- a/.github/workflows/dockerhub-description.yml +++ b/.github/workflows/dockerhub-description.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - master + - main paths: - README.md - .github/workflows/dockerhub-description.yml @@ -16,7 +16,7 @@ jobs: - name: Modify readme for DockerHub run: | sed -i 's/# Docker Hub Description/# [Docker Hub Description](https:\/\/github.com\/peter-evans\/dockerhub-description)/' README.md - sed -i 's/(LICENSE)/(https:\/\/github.com\/peter-evans\/dockerhub-description\/blob\/master\/LICENSE)/' README.md + sed -i 's/(LICENSE)/(https:\/\/github.com\/peter-evans\/dockerhub-description\/blob\/main\/LICENSE)/' README.md - name: Docker Hub Description uses: ./ diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 60355ef..3b83fa1 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -2,7 +2,7 @@ name: Publish Docker Image on: push: branches: - - master + - main tags: - v* env: @@ -25,7 +25,7 @@ jobs: [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') # Use Docker `latest` tag convention - [ "$VERSION" == "master" ] && VERSION=latest + [ "$VERSION" == "main" ] && VERSION=latest # Build and tag image docker build . --file Dockerfile --tag $IMAGE_NAME --label "org.opencontainers.image.version=$VERSION" diff --git a/README.md b/README.md index 7ad8d68..e191423 100644 --- a/README.md +++ b/README.md @@ -59,14 +59,14 @@ The GitHub repository description can be used for the Docker Hub `short-descript ### Examples -The following workflow updates the Docker Hub repository description whenever there are changes to `README.md` and the workflow file itself on the `master` branch. This workflow assumes its location to be `.github/workflows/dockerhub-description.yml`. +The following workflow updates the Docker Hub repository description whenever there are changes to `README.md` and the workflow file itself on the `main` branch. This workflow assumes its location to be `.github/workflows/dockerhub-description.yml`. ```yml name: Update Docker Hub Description on: push: branches: - - master + - main paths: - README.md - .github/workflows/dockerhub-description.yml