From ffa4a9c71808d55255ac3dc6fd1238a4600e24d7 Mon Sep 17 00:00:00 2001 From: tyranron Date: Thu, 14 Jul 2022 12:02:22 +0200 Subject: [PATCH] Switch default Git branch to `main` --- .github/workflows/ci.yml | 10 +++++----- Makefile | 2 +- README.md | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d708b99..99faf97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,10 @@ name: CI on: push: - branches: ["master"] + branches: ["main"] tags: ["*"] pull_request: - branches: ["master"] + branches: ["main"] schedule: - cron: "3 7 * * 3" @@ -36,12 +36,12 @@ jobs: - uses: satackey/action-docker-layer-caching@v0.0.11 continue-on-error: true - if: ${{ env.PUBLISH != 'true' && github.ref != 'refs/heads/master' }} + if: ${{ env.PUBLISH != 'true' && github.ref != 'refs/heads/main' }} - run: make docker.image no-cache=no tag=build-${{ github.run_number }} - if: ${{ env.PUBLISH != 'true' && github.ref != 'refs/heads/master' }} + if: ${{ env.PUBLISH != 'true' && github.ref != 'refs/heads/main' }} - run: make docker.image no-cache=yes tag=build-${{ github.run_number }} - if: ${{ env.PUBLISH == 'true' || github.ref == 'refs/heads/master' }} + if: ${{ env.PUBLISH == 'true' || github.ref == 'refs/heads/main' }} - run: make npm.install - run: make test.docker tag=build-${{ github.run_number }} diff --git a/Makefile b/Makefile index e887387..33b67ec 100755 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ git.release: ifeq ($(shell git rev-parse $(git-release-tag) >/dev/null 2>&1 && echo "ok"),ok) $(error "Git tag $(git-release-tag) already exists") endif - git tag $(git-release-tag) master + git tag $(git-release-tag) main git push origin refs/tags/$(git-release-tag) diff --git a/README.md b/README.md index eccb543..303aa4c 100755 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ Flutter Docker image ==================== [![Release](https://img.shields.io/github/v/release/instrumentisto/flutter-docker-image "Release")](https://github.com/instrumentisto/flutter-docker-image/releases) -[![CI](https://github.com/instrumentisto/flutter-docker-image/workflows/CI/badge.svg?branch=master "CI")](https://github.com/instrumentisto/flutter-docker-image/actions?query=workflow%3ACI+branch%3Amaster) +[![CI](https://github.com/instrumentisto/flutter-docker-image/workflows/CI/badge.svg?branch=main "CI")](https://github.com/instrumentisto/flutter-docker-image/actions?query=workflow%3ACI+branch%3Amain) [![Docker Hub](https://img.shields.io/docker/pulls/instrumentisto/flutter?label=Docker%20Hub%20pulls "Docker Hub pulls")](https://hub.docker.com/r/instrumentisto/flutter) [Docker Hub](https://hub.docker.com/r/instrumentisto/flutter) | [GitHub Container Registry](https://github.com/orgs/instrumentisto/packages/container/package/flutter) | [Quay.io](https://quay.io/repository/instrumentisto/flutter) -[Changelog](https://github.com/instrumentisto/flutter-docker-image/blob/master/CHANGELOG.md) +[Changelog](https://github.com/instrumentisto/flutter-docker-image/blob/main/CHANGELOG.md) Based on [`cirrusci/android-sdk` Docker image][2]. @@ -113,7 +113,7 @@ If you have any problems with or questions about this image, please contact us t [80]: https://github.com/instrumentisto/flutter-docker-image/issues [90]: https://github.com/instrumentisto/flutter-docker-image -[91]: https://github.com/instrumentisto/flutter-docker-image/blob/master/LICENSE.md +[91]: https://github.com/instrumentisto/flutter-docker-image/blob/main/LICENSE.md [92]: https://github.com/flutter/flutter/blob/master/LICENSE -[201]: https://github.com/instrumentisto/flutter-docker-image/blob/master/Dockerfile +[201]: https://github.com/instrumentisto/flutter-docker-image/blob/main/Dockerfile