Skip to content

Commit

Permalink
Switch default Git branch to main
Browse files Browse the repository at this point in the history
tyranron committed Jul 14, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 471b167 commit ffa4a9c
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
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 }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)


8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit ffa4a9c

Please sign in to comment.