mirror of
https://github.com/mas-cli/mas
synced 2024-11-22 03:23:08 +00:00
🪧 Update references to main branch
This commit is contained in:
parent
d52982e6ee
commit
ff357772c6
4 changed files with 10 additions and 10 deletions
|
@ -20,13 +20,13 @@ you are exeriencing.
|
||||||
- Cone your fork
|
- Cone your fork
|
||||||
`git clone git@github.com:your-username/mas.git`
|
`git clone git@github.com:your-username/mas.git`
|
||||||
- Create a topic branch from where you want to base your work.
|
- Create a topic branch from where you want to base your work.
|
||||||
- This is usually the `master` branch.
|
- This is usually the `main` branch.
|
||||||
- To quickly create a topic branch based on `master`, run
|
- To quickly create a topic branch based on `main`, run
|
||||||
`git checkout -b awesome-feature master`
|
`git checkout -b awesome-feature main`
|
||||||
- Please avoid working [directly on the master branch](https://softwareengineering.stackexchange.com/questions/223400/when-should-i-stop-committing-to-master-on-new-projects).
|
- Please avoid working [directly on the main branch](https://softwareengineering.stackexchange.com/questions/223400/when-should-i-stop-committing-to-master-on-new-projects).
|
||||||
- Make commits of logical units.
|
- Make commits of logical units.
|
||||||
- Run script/format before committing your changes. Fix anything that isn't automatically fixed by the linters.
|
- Run script/format before committing your changes. Fix anything that isn't automatically fixed by the linters.
|
||||||
- Push your topic branch to your fork and [submit a pull request](https://github.com/mas-cli/mas/compare/master...your-username:topic-branch).
|
- Push your topic branch to your fork and [submit a pull request](https://github.com/mas-cli/mas/compare/main...your-username:topic-branch).
|
||||||
|
|
||||||
Some things that will increase the chance that your pull request is accepted:
|
Some things that will increase the chance that your pull request is accepted:
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ to this project, but must remain an owner. By becoming a contributor, you agree
|
||||||
|
|
||||||
## Branching and Releases
|
## Branching and Releases
|
||||||
|
|
||||||
- This project follows [trunk-based development](https://trunkbaseddevelopment.com/), where `master` is our trunk.
|
- This project follows [trunk-based development](https://trunkbaseddevelopment.com/), where `main` is our trunk.
|
||||||
- Release commits will be tagged in the format: `v1.2.3`.
|
- Release commits will be tagged in the format: `v1.2.3`.
|
||||||
- Once releases are tagged, high-level release notes are published on the
|
- Once releases are tagged, high-level release notes are published on the
|
||||||
[releases](https://github.com/mas-cli/mas/releases) page.
|
[releases](https://github.com/mas-cli/mas/releases) page.
|
||||||
|
|
|
@ -35,6 +35,6 @@ warn(":construction: PR is classed as Work in Progress") if github.pr_title.incl
|
||||||
# Warn when there is a big PR
|
# Warn when there is a big PR
|
||||||
warn(":dizzy_face: Big PR") if git.lines_of_code > 500
|
warn(":dizzy_face: Big PR") if git.lines_of_code > 500
|
||||||
|
|
||||||
# Don't let testing shortcuts get into master by accident
|
# Don't let testing shortcuts get into main by accident
|
||||||
#fail("fdescribe left in tests") if `grep -r fdescribe Tests/ `.length > 1
|
#fail("fdescribe left in tests") if `grep -r fdescribe Tests/ `.length > 1
|
||||||
#fail("fit left in tests") if `grep -r fit Tests/ `.length > 1
|
#fail("fit left in tests") if `grep -r fit Tests/ `.length > 1
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
A simple command line interface for the Mac App Store. Designed for scripting and automation.
|
A simple command line interface for the Mac App Store. Designed for scripting and automation.
|
||||||
|
|
||||||
[![Software License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/mas-cli/mas/blob/master/LICENSE)
|
[![Software License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/mas-cli/mas/blob/main/LICENSE)
|
||||||
[![Swift 5](https://img.shields.io/badge/Language-Swift_5-orange.svg)](https://swift.org)
|
[![Swift 5](https://img.shields.io/badge/Language-Swift_5-orange.svg)](https://swift.org)
|
||||||
[![GitHub Release](https://img.shields.io/github/release/mas-cli/mas.svg)](https://github.com/mas-cli/mas/releases)
|
[![GitHub Release](https://img.shields.io/github/release/mas-cli/mas.svg)](https://github.com/mas-cli/mas/releases)
|
||||||
[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
|
[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
|
||||||
[![Build & Test](https://github.com/mas-cli/mas/actions/workflows/build-test.yml/badge.svg?branch=master)](https://github.com/mas-cli/mas/actions/workflows/build-test.yml?query=branch%3Amaster)
|
[![Build & Test](https://github.com/mas-cli/mas/actions/workflows/build-test.yml/badge.svg?branch=main)](https://github.com/mas-cli/mas/actions/workflows/build-test.yml?query=branch%3Amain)
|
||||||
|
|
||||||
## 📲 Install
|
## 📲 Install
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
- Avoid [force unwrapping optionals](https://blog.timac.org/2017/0628-swift-banning-force-unwrapping-optionals/)
|
- Avoid [force unwrapping optionals](https://blog.timac.org/2017/0628-swift-banning-force-unwrapping-optionals/)
|
||||||
with `!` in production code
|
with `!` in production code
|
||||||
- Production code is what gets shipped with the app. Basically, everything under the
|
- Production code is what gets shipped with the app. Basically, everything under the
|
||||||
[`mas-cli/`](https://github.com/mas-cli/mas/tree/master/mas-cli) folder.
|
[`mas-cli/`](https://github.com/mas-cli/mas/tree/main/mas-cli) folder.
|
||||||
- However, force unwrapping is **encouraged** in tests for less code and tests
|
- However, force unwrapping is **encouraged** in tests for less code and tests
|
||||||
_should_ break when any expected conditions aren't met.
|
_should_ break when any expected conditions aren't met.
|
||||||
- Prefer `struct`s over `class`es wherever possible
|
- Prefer `struct`s over `class`es wherever possible
|
||||||
|
|
Loading…
Reference in a new issue