Skip to content

Commit

Permalink
chore: update default branch name and remote
Browse files Browse the repository at this point in the history
  • Loading branch information
oknozor committed Nov 30, 2021
1 parent c6940c5 commit 477b6ac
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
test:
name: Tests
Expand All @@ -24,7 +24,7 @@ jobs:
git config --global user.name github-actions
- name: Conventional commit check
uses: oknozor/cocogitto-action@v1
uses: cocogitto/cocogitto-action@v1
with:
git-user: 'github-actions'
git-user-email: 'github-actions@github.com'
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Paul Delafosse <paul.delafosse@protonmail.com>"]
edition = "2018"
readme = "README.md"
license-file = "LICENSE"
repository = "https://github.com/oknozor/cocogitto"
repository = "https://github.com/cocogitto/cocogitto"
description = """
Cocogitto is a set of cli tools for the conventional commit
and semver specifications.
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Cocogitto
![logo](docs/assets/logo.png)
![CI](https://github.com/oknozor/cocogitto/workflows/CI/badge.svg)
[![codecov](https://codecov.io/gh/oknozor/cocogitto/branch/master/graph/badge.svg)](https://codecov.io/gh/oknozor/cocogitto)
![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/oknozor/cocogitto)
![CI](https://github.com/cocogitto/cocogitto/workflows/CI/badge.svg)
[![codecov](https://codecov.io/gh/cocogitto/cocogitto/branch/main/graph/badge.svg)](https://codecov.io/gh/oknozor/cocogitto)
![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/cocogitto/cocogitto)
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
![License](https://img.shields.io/github/license/oknozor/cocogitto)
![License](https://img.shields.io/github/license/cocogitto/cocogitto)


Cocogitto is a set of cli tools for the [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/)
Expand Down Expand Up @@ -351,7 +351,7 @@ caef0f - another cool feature - Paul Delafosse

- - -

This changelog was generated by [cocogitto](https://github.com/oknozor/cocogitto).
This changelog was generated by [cocogitto](https://github.com/cocogitto/cocogitto).
```

You need to run `cog bump` with one of the following flags:
Expand Down Expand Up @@ -429,7 +429,7 @@ post_bump_hooks = [
"git push",
"git push origin {{version}}",
"git checkout develop",
"git rebase master",
"git rebase main",
"mvn versions:set -DnewVersion={{version+minor-SNAPSHOT}}",
"coco chore \"bump snapshot to {{version+1minor-SNAPSHOT}}\"",
"git push",
Expand Down Expand Up @@ -473,7 +473,7 @@ Or one by one, specifying the hook name:

## Github action

You can run cog check on github action using [cocogitto-action](https://github.com/oknozor/cocogitto-action).
You can run cog check on github action using [cocogitto-action](https://github.com/cocogitto/cocogitto-action).

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions ci/check_branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

branch=$(git rev-parse --abbrev-ref HEAD)

if [ $branch != "master" ]
if [ $branch != "main" ]
then
echo "Needs to be on master to bump current version"
echo "Needs to be on main to bump current version"
exit 1
fi
2 changes: 1 addition & 1 deletion cog.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ path = "CHANGELOG.md"
template = "remote"
remote = "github.com"
repository = "cocogitto"
owner = "oknozor"
owner = "cocogitto"
# Optional contributor list
# intended to map git signature to remote username
# and generate changelog links to their remote profiles
Expand Down
2 changes: 1 addition & 1 deletion src/conventional/changelog/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const DEFAULT_HEADER: &str =
See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.\n\n- - -\n";

const DEFAULT_FOOTER: &str =
"Changelog generated by [cocogitto](https://github.com/oknozor/cocogitto).";
"Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).";

impl Release<'_> {
pub fn into_markdown(self, template: Template) -> Result<String, tera::Error> {
Expand Down
10 changes: 5 additions & 5 deletions src/conventional/changelog/release.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ mod test {
context: Some(RemoteContext::new(
"github.com".into(),
"cocogitto".into(),
"oknozor".into(),
"cocogitto".into(),
)),
kind: TemplateKind::Remote,
})?;
Expand All @@ -167,12 +167,12 @@ mod test {
// Assert
assert_that!(changelog).is_ok().is_equal_to(
indoc! {
"## [1.0.0](https://github.com/oknozor/cocogitto/compare/0.1.0..1.0.0) - 2015-09-05
"## [1.0.0](https://github.com/cocogitto/cocogitto/compare/0.1.0..1.0.0) - 2015-09-05
#### Bug Fixes
- **(parser)** fix parser implementation - ([17f7e23](https://github.com/oknozor/cocogitto/commit/17f7e23081db15e9318aeb37529b1d473cf41cbe)) - [@oknozor](https://github.com/oknozor)
- **(parser)** fix parser implementation - ([17f7e23](https://github.com/cocogitto/cocogitto/commit/17f7e23081db15e9318aeb37529b1d473cf41cbe)) - [@oknozor](https://github.com/oknozor)
#### Features
- **(parser)** implement the changelog generator - ([17f7e23](https://github.com/oknozor/cocogitto/commit/17f7e23081db15e9318aeb37529b1d473cf41cbe)) - [@oknozor](https://github.com/oknozor)
- awesome feature - ([17f7e23](https://github.com/oknozor/cocogitto/commit/17f7e23081db15e9318aeb37529b1d473cf41cbe)) - Paul Delafosse"
- **(parser)** implement the changelog generator - ([17f7e23](https://github.com/cocogitto/cocogitto/commit/17f7e23081db15e9318aeb37529b1d473cf41cbe)) - [@oknozor](https://github.com/oknozor)
- awesome feature - ([17f7e23](https://github.com/cocogitto/cocogitto/commit/17f7e23081db15e9318aeb37529b1d473cf41cbe)) - Paul Delafosse"
}
.to_string(),
);
Expand Down

0 comments on commit 477b6ac

Please sign in to comment.