Skip to content

Commit

Permalink
Switch default Git branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed Jun 30, 2022
1 parent 8efdbe9 commit 9cee6f8
Show file tree
Hide file tree
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
Expand Up @@ -2,10 +2,10 @@ name: CI

on:
push:
branches: ["master"]
branches: ["main"]
tags: ["*"]
pull_request:
branches: ["master"]
branches: ["main"]
schedule:
- cron: "0 10 * * 5"

Expand Down Expand Up @@ -37,12 +37,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 }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,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)


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Pure-FTPd Docker image
======================

[![Release](https://img.shields.io/github/v/release/instrumentisto/pure-ftpd-docker-image "Release")](https://github.com/instrumentisto/pure-ftpd-docker-image/releases)
[![CI](https://github.com/instrumentisto/pure-ftpd-docker-image/workflows/CI/badge.svg?branch=master "CI")](https://github.com/instrumentisto/pure-ftpd-docker-image/actions?query=workflow%3ACI+branch%3Amaster)
[![CI](https://github.com/instrumentisto/pure-ftpd-docker-image/workflows/CI/badge.svg?branch=main "CI")](https://github.com/instrumentisto/pure-ftpd-docker-image/actions?query=workflow%3ACI+branch%3Amain)
[![Docker Hub](https://img.shields.io/docker/pulls/instrumentisto/pure-ftpd?label=Docker%20Hub%20pulls "Docker Hub pulls")](https://hub.docker.com/r/instrumentisto/pure-ftpd)
[![Uses](https://img.shields.io/badge/uses-s6--overlay-blue.svg "Uses s6-overlay")](https://github.com/just-containers/s6-overlay)

[Docker Hub](https://hub.docker.com/r/instrumentisto/pure-ftpd)
| [GitHub Container Registry](https://github.com/orgs/instrumentisto/packages/container/package/pure-ftpd)
| [Quay.io](https://quay.io/repository/instrumentisto/pure-ftpd)

[Changelog](https://github.com/instrumentisto/pure-ftpd-docker-image/blob/master/CHANGELOG.md)
[Changelog](https://github.com/instrumentisto/pure-ftpd-docker-image/blob/main/CHANGELOG.md)



Expand Down Expand Up @@ -183,8 +183,8 @@ If you have any problems with or questions about this image, please contact us t
[21]: https://github.com/just-containers/s6-overlay
[22]: https://github.com/just-containers/s6-overlay#usage
[90]: https://github.com/instrumentisto/pure-ftpd-docker-image
[91]: https://github.com/instrumentisto/pure-ftpd-docker-image/blob/master/LICENSE.md
[91]: https://github.com/instrumentisto/pure-ftpd-docker-image/blob/main/LICENSE.md
[92]: https://download.pureftpd.org/pub/pure-ftpd/doc/COPYING
[101]: https://nvd.nist.gov/view/vuln/search-results?query=pure-ftpd&search_type=all&cves=on
[201]: https://github.com/instrumentisto/pure-ftpd-docker-image/blob/master/Dockerfile
[201]: https://github.com/instrumentisto/pure-ftpd-docker-image/blob/main/Dockerfile

0 comments on commit 9cee6f8

Please sign in to comment.