Replace 'master' branch references with 'main' (#1029)

For #1028.
This commit is contained in:
Ed Morley
2020-08-03 17:31:08 +01:00
committed by GitHub
parent d74880b322
commit 81874dad47
4 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ language: minimal
dist: bionic
branches:
only:
- master
- main
script:
- make test STACK="${STACK}" TEST_CMD="${TEST_CMD}"
+2 -1
View File
@@ -1,7 +1,8 @@
# Python Buildpack Changelog
# Master
# Unreleased
- Switch the `heroku-buildpack-python` repository default branch from `master` to `main` (#1029).
# 174 (2020-07-30)
+2 -2
View File
@@ -2,7 +2,7 @@
# Heroku Buildpack: Python
[![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/heroku-buildpack-python)
[![Build Status](https://travis-ci.com/heroku/heroku-buildpack-python.svg?branch=main)](https://travis-ci.com/heroku/heroku-buildpack-python)
This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps.
@@ -16,7 +16,7 @@ See it in Action
$ ls
my-application requirements.txt runtime.txt
$ git push heroku master
$ git push heroku main
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done.
+4 -4
View File
@@ -14,9 +14,9 @@ case "$choice" in
* ) exit 1;;
esac
originMaster=$(git rev-parse origin/master)
echo "Tagging commit $originMaster with $newVersion... "
git tag "$newVersion" "${originMaster:?}"
originMain=$(git rev-parse origin/main)
echo "Tagging commit $originMain with $newVersion... "
git tag "$newVersion" "${originMain:?}"
git push origin refs/tags/$newVersion
heroku buildpacks:publish "$BP_NAME" "$newVersion"
@@ -31,7 +31,7 @@ if [ $(git tag | grep -q latest-version) ]; then
echo "Updating latest-version tag"
git tag -d latest-version
git push origin :latest-version
git tag latest-version "${originMaster:?}"
git tag latest-version "${originMain:?}"
git push --tags
fi