From fa432a121e3c409de77cd2e2b1085b31b93be4c6 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 5 Jun 2021 04:06:58 +0200 Subject: [PATCH] Rename various references to master branch --- .ci/deploy-docs.sh | 4 ++-- .github/workflows/linux-ci.yml | 6 +++--- .github/workflows/msvc-ci.yml | 4 ++-- .github/workflows/msys2-ci.yml | 4 ++-- README | 8 ++++---- README.md | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci/deploy-docs.sh b/.ci/deploy-docs.sh index 854ca2354..a8efb2a07 100755 --- a/.ci/deploy-docs.sh +++ b/.ci/deploy-docs.sh @@ -23,12 +23,12 @@ echo "git remote add upstream \"https://\$GH_TOKEN@github.com/harfbuzz/harfbuzz. git remote add upstream "https://$GH_TOKEN@github.com/harfbuzz/harfbuzz.github.io.git" set -x git fetch upstream -git reset upstream/master +git reset upstream/main touch . git add -A . if [[ $(git status -s) ]]; then git commit -m "Rebuild docs for https://github.com/harfbuzz/harfbuzz/commit/$REVISION" - git push -q upstream HEAD:master + git push -q upstream HEAD:main fi diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index b780451dd..88b1f593d 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -2,9 +2,9 @@ name: linux-ci on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: @@ -23,7 +23,7 @@ jobs: - name: generate documentations run: ninja -Cbuild harfbuzz-doc - name: deploy documentations - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' run: .ci/deploy-docs.sh env: GH_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/msvc-ci.yml b/.github/workflows/msvc-ci.yml index 2dd722eda..7c9f5bc76 100644 --- a/.github/workflows/msvc-ci.yml +++ b/.github/workflows/msvc-ci.yml @@ -2,9 +2,9 @@ name: msvc on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: msvc: diff --git a/.github/workflows/msys2-ci.yml b/.github/workflows/msys2-ci.yml index 26a3dfe54..b8b2fc390 100644 --- a/.github/workflows/msys2-ci.yml +++ b/.github/workflows/msys2-ci.yml @@ -2,9 +2,9 @@ name: msys2 on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: msys2: diff --git a/README b/README index f4d2294c9..84c542f8a 100644 --- a/README +++ b/README @@ -4,12 +4,12 @@ For bug reports, mailing list, and other information please visit: http://harfbuzz.org/ -For license information, see https://github.com/harfbuzz/harfbuzz/blob/master/COPYING +For license information, see https://github.com/harfbuzz/harfbuzz/blob/main/COPYING -For build information, see https://github.com/harfbuzz/harfbuzz/blob/master/BUILD.md +For build information, see https://github.com/harfbuzz/harfbuzz/blob/main/BUILD.md -For custom configurations, see https://github.com/harfbuzz/harfbuzz/blob/master/CONFIG.md +For custom configurations, see https://github.com/harfbuzz/harfbuzz/blob/main/CONFIG.md -For test execution, see https://github.com/harfbuzz/harfbuzz/blob/master/TESTING.md +For test execution, see https://github.com/harfbuzz/harfbuzz/blob/main/TESTING.md Documentation: https://harfbuzz.github.io diff --git a/README.md b/README.md index 0df556de3..9deb32c1e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [![Linux CI Status](https://github.com/harfbuzz/harfbuzz/workflows/linux-ci/badge.svg)](https://github.com/harfbuzz/harfbuzz/workflows/linux-ci/badge.svg) -[![CircleCI Build Status](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master) +[![CircleCI Build Status](https://circleci.com/gh/harfbuzz/harfbuzz/tree/main.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz/tree/main) [![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/harfbuzz.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html) [![Coverity Code Health](https://img.shields.io/coverity/scan/5450.svg)](https://scan.coverity.com/projects/behdad-harfbuzz) [![Codacy Code Health](https://api.codacy.com/project/badge/Grade/f17f1708783c447488bc8dd317150eaa)](https://app.codacy.com/app/behdad/harfbuzz) -[![Codecov Code Coverage](https://codecov.io/gh/harfbuzz/harfbuzz/branch/master/graph/badge.svg)](https://codecov.io/gh/harfbuzz/harfbuzz) +[![Codecov Code Coverage](https://codecov.io/gh/harfbuzz/harfbuzz/branch/main/graph/badge.svg)](https://codecov.io/gh/harfbuzz/harfbuzz) [![Coverals Code Coverage](https://img.shields.io/coveralls/harfbuzz/harfbuzz.svg)](https://coveralls.io/r/harfbuzz/harfbuzz) [![Packaging status](https://repology.org/badge/tiny-repos/harfbuzz.svg)](https://repology.org/project/harfbuzz/versions) [ABI Tracker](http://abi-laboratory.pro/tracker/timeline/harfbuzz/)