Skip to content
This repository has been archived by the owner on Dec 5, 2022. It is now read-only.

Commit

Permalink
Replace 'master' branch references with 'main' (heroku#1029)
Browse files Browse the repository at this point in the history
  • Loading branch information
edmorley authored and dryan committed Nov 19, 2020
1 parent d76854c commit 0230744
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: minimal
dist: bionic
branches:
only:
- master
- main

script:
- make test STACK="${STACK}" TEST_CMD="${TEST_CMD}"
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

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

Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions etc/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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

Expand Down

0 comments on commit 0230744

Please sign in to comment.