From 4d8285bad2fa5f0d978c2904c437d15aaa078825 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 21 Apr 2021 11:35:35 -0700 Subject: [PATCH] rename master branch to main aligning with new GitHub default --- .travis.yml | 4 ++-- README.md | 2 +- RELEASING.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5aebab7..e8795dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ jobs: stages: - name: test - name: publish - if: ((branch = master AND type = push) OR (tag IS present)) AND NOT fork + if: ((branch = main AND type = push) OR (tag IS present)) AND NOT fork cache: directories: @@ -65,5 +65,5 @@ before_cache: branches: only: - - master + - main - /^\d+\.\d+(\.\d+)?(-\S*)?$/ diff --git a/README.md b/README.md index 67586fb..7b11dd3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CacheControl -[![Build Status](https://travis-ci.org/playframework/cachecontrol.svg?branch=master)](https://travis-ci.org/playframework/cachecontrol) [![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/cachecontrol_2.12.svg)](http://mvnrepository.com/artifact/com.typesafe.play/cachecontrol_2.12) +[![Build Status](https://travis-ci.org/playframework/cachecontrol.svg?branch=main)](https://travis-ci.org/playframework/cachecontrol) [![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/cachecontrol_2.12.svg)](http://mvnrepository.com/artifact/com.typesafe.play/cachecontrol_2.12) This is a minimal library that provides a set of utility calculators that abstract away much of the fiddly complexities involved in adhering to the HTTP caching model, aka [RFC 7234](https://tools.ietf.org/html/rfc7234). The core idea is abstracting the decision about what to cache and when, following the example of [Caching is Hard, Draw Me A Picture](http://www.bizcoder.com/caching-is-hard-draw-me-a-picture). diff --git a/RELEASING.md b/RELEASING.md index fe428fe..276bd42 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,13 +1,13 @@ ## Releasing -This is released from the `master` branch from `2.0.1` forward. Unless an older version needs patching, then it must be released from the maintenance branch, for instance `2.0.x` branch. If there is no maintenance branch for the release that needs patching, create it from the tag. +This is released from the `main` branch from `2.0.1` forward. Unless an older version needs patching, then it must be released from the maintenance branch, for instance `2.0.x` branch. If there is no maintenance branch for the release that needs patching, create it from the tag. ## Cutting the release ### Requires contributor access - Check the [draft release notes](https://github.com/playframework/cachecontrol/releases) to see if everything is there -- Wait until [master build finished](https://travis-ci.com/github/playframework/cachecontrol/builds) after merging the last PR +- Wait until [main build finished](https://travis-ci.com/github/playframework/cachecontrol/builds) after merging the last PR - Update the [draft release](https://github.com/playframework/cachecontrol/releases) with the next tag version (eg. `2.2.0`), title and release description - Check that Travis CI release build has executed successfully (Travis will start a [CI build](https://travis-ci.com/github/playframework/cachecontrol/builds) for the new tag and publish artifacts to Bintray)