Skip to content

Commit

Permalink
Merge pull request Quick#896 from Quick/follow-branch-renaming
Browse files Browse the repository at this point in the history
Follow `master`-to-`main` branch renaming
  • Loading branch information
ikesyo authored May 24, 2021
2 parents 2afc524 + 7475f7f commit a042c86
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- [ ] I have read [CONTRIBUTING](https://github.com/Quick/Nimble/blob/master/CONTRIBUTING.md) and have done my best to follow them.
- [ ] I have read [CONTRIBUTING](https://github.com/Quick/Nimble/blob/main/CONTRIBUTING.md) and have done my best to follow them.

### What did you do?

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-swiftpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI (SwiftPM)
on:
push:
branches:
- master
- main
tags:
- "*"
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-xcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI (Xcode)
on:
push:
branches:
- master
- main
tags:
- "*"
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cocoapods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CocoaPods
on:
push:
branches:
- master
- main
tags:
- "*"
pull_request:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Be sure to include in your issue:
tests using `./test`.
- If you've added a file to the project, make sure it's included in both
the OS X and iOS targets.
- The `master` branch will always support the stable Xcode version. Other
- The `main` branch will always support the stable Xcode version. Other
branches will point to their corresponding versions they support.
- If you're making a configuration change, make sure to edit both the xcode
project and the podspec file.
Expand All @@ -92,7 +92,7 @@ to the repository.
Your conduct as a core member is your own responsibility, but here are
some "ground rules":

- Feel free to push whatever you want to master, and (if you have
- Feel free to push whatever you want to main, and (if you have
ownership permissions) to create any repositories you'd like.

Ideally, however, all changes should be submitted as GitHub pull
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Nimble

[![Build Status](https://travis-ci.org/Quick/Nimble.svg?branch=master)](https://travis-ci.org/Quick/Nimble)
[![Build Status](https://github.com/Quick/Nimble/actions/workflows/ci-xcode.yml/badge.svg)](https://github.com/Quick/Nimble/actions/workflows/ci-xcode.yml)
[![CocoaPods](https://img.shields.io/cocoapods/v/Nimble.svg)](https://cocoapods.org/pods/Nimble)
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![Accio supported](https://img.shields.io/badge/Accio-supported-0A7CF5.svg?style=flat)](https://github.com/JamitLabs/Accio)
Expand Down Expand Up @@ -1335,7 +1335,7 @@ in an Xcode project you distribute to others.
distribute it yourself via GitHub.

For examples of how to write your own matchers, just check out the
[`Matchers` directory](https://github.com/Quick/Nimble/tree/master/Sources/Nimble/Matchers)
[`Matchers` directory](https://github.com/Quick/Nimble/tree/main/Sources/Nimble/Matchers)
to see how Nimble's built-in set of matchers are implemented. You can
also check out the tips below.

Expand Down Expand Up @@ -1636,7 +1636,7 @@ removed completely in Nimble v10.
> Nimble can be used on its own, or in conjunction with its sister
project, [Quick](https://github.com/Quick/Quick). To install both
Quick and Nimble, follow [the installation instructions in the Quick
Documentation](https://github.com/Quick/Quick/blob/master/Documentation/en-us/InstallingQuick.md).
Documentation](https://github.com/Quick/Quick/blob/main/Documentation/en-us/InstallingQuick.md).

Nimble can currently be installed in one of two ways: using CocoaPods, or with
git submodules.
Expand Down
2 changes: 1 addition & 1 deletion script/release
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
REMOTE_BRANCH=master
REMOTE_BRANCH=main
POD_NAME=Nimble
PODSPEC=Nimble.podspec

Expand Down

0 comments on commit a042c86

Please sign in to comment.