Skip to content

Commit 7475f7f

Browse files
committed
Follow master-to-main branch renaming
1 parent 2afc524 commit 7475f7f

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/ISSUE_TEMPLATE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- [ ] I have read [CONTRIBUTING](https://github.com/Quick/Nimble/blob/master/CONTRIBUTING.md) and have done my best to follow them.
1+
- [ ] I have read [CONTRIBUTING](https://github.com/Quick/Nimble/blob/main/CONTRIBUTING.md) and have done my best to follow them.
22

33
### What did you do?
44

.github/workflows/ci-swiftpm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI (SwiftPM)
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- "*"
99
pull_request:

.github/workflows/ci-xcode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI (Xcode)
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- "*"
99
pull_request:

.github/workflows/cocoapods.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CocoaPods
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- "*"
99
pull_request:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Be sure to include in your issue:
6868
tests using `./test`.
6969
- If you've added a file to the project, make sure it's included in both
7070
the OS X and iOS targets.
71-
- The `master` branch will always support the stable Xcode version. Other
71+
- The `main` branch will always support the stable Xcode version. Other
7272
branches will point to their corresponding versions they support.
7373
- If you're making a configuration change, make sure to edit both the xcode
7474
project and the podspec file.
@@ -92,7 +92,7 @@ to the repository.
9292
Your conduct as a core member is your own responsibility, but here are
9393
some "ground rules":
9494

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

9898
Ideally, however, all changes should be submitted as GitHub pull

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Nimble
22

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

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

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

16411641
Nimble can currently be installed in one of two ways: using CocoaPods, or with
16421642
git submodules.

script/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env sh
2-
REMOTE_BRANCH=master
2+
REMOTE_BRANCH=main
33
POD_NAME=Nimble
44
PODSPEC=Nimble.podspec
55

0 commit comments

Comments
 (0)