From c71b3896a2fbdbc037aa813284c6183e9d8b99fd Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 3 Aug 2020 14:22:13 +0100 Subject: [PATCH] Replace 'master' branch references with 'main' For #1028. --- .travis.yml | 2 +- CHANGELOG.md | 3 ++- README.md | 4 ++-- etc/publish.sh | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38f32570c..900f9ac65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: minimal dist: bionic branches: only: - - master + - main script: - make test STACK="${STACK}" TEST_CMD="${TEST_CMD}" diff --git a/CHANGELOG.md b/CHANGELOG.md index cfde063b8..db62c76c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/README.md b/README.md index 5884f1996..3c4855a0c 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/etc/publish.sh b/etc/publish.sh index 4b7b45e88..2fa1efb26 100644 --- a/etc/publish.sh +++ b/etc/publish.sh @@ -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