Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release/3.0.0 develop #78

Merged
merged 3 commits into from
Mar 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
# [3.0.0] - 2023-03-12
# [3.0.0] - 2023-03-27

## Added
- [#55](https://github.com/minnek-digital-studio/cominnek/issues/55) Remove git flow and implement the TAYO Methodology
- [#56](https://github.com/minnek-digital-studio/cominnek/issues/56) Show live messages while commit or push is running
- [#57](https://github.com/minnek-digital-studio/cominnek/issues/57) Add events manager (will be used for plugins)
- [#59](https://github.com/minnek-digital-studio/cominnek/issues/59) Add Test branch support
- [#66](https://github.com/minnek-digital-studio/cominnek/issues/66) Add support for the `git reset` command
- [#67](https://github.com/minnek-digital-studio/cominnek/issues/67) Add support for clone repository from GitHub

## Fixed

- [#69](https://github.com/minnek-digital-studio/cominnek/issues/69) Check if the user has an internet connection to prevent errors

# [3.0.0-beta.2] - 2023-03-25
## Fixed

- [8b17dd1](https://github.com/minnek-digital-studio/cominnek/commit/8b17dd1) add validation before checkout to develop

# [3.0.0-beta.1] - 2023-03-25
## Added

- [f31d1db](https://github.com/minnek-digital-studio/cominnek/commit/f31d1db) add events for the reset command

## Fixed

- [bdd8794](https://github.com/minnek-digital-studio/cominnek/commit/bdd8794) add grep variation for windows
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@

<img src="./assets/banner.png" />

Create commits & pull requests easily. `Cominnek` is based on the [Semantic Commit Messages](https://www.conventionalcommits.org/en/v1.0.0/) specification.
Create commits & pull requests easily. `Cominnek` is based on [TAYO](https://mnk-docs.ngrok.io/guide/development/version-control/branch-management.html) by Minnek.
## Index
- **[Requirements](#requirements)**
- **[Install](#installation)**
- **[Update](#update)**
- **[First Step](#first-steps)**
- **[Usage](#usage)**
- **[Ticketing System](#ticketing-system)**
Expand All @@ -29,15 +30,16 @@ Create commits & pull requests easily. `Cominnek` is based on the [Semantic Comm

1. Download installer

[![Macos](https://img.shields.io/badge/mac%20os-0078D6?style=for-the-badge&logo=apple&logoColor=white)](https://github.com/Minnek-Digital-Studio/cominnek/releases/latest/download/cominnek-2.5.0.dmg) [![Windows](https://img.shields.io/badge/Windows-0078D6?style=for-the-badge&logo=windows&logoColor=white
)](https://github.com/Minnek-Digital-Studio/cominnek/releases/latest/download/cominnek-2.5.0.exe) [![Linux](https://img.shields.io/badge/Linux-0078D6?style=for-the-badge&logo=linux&logoColor=white)](https://github.com/Minnek-Digital-Studio/cominnek/releases/latest/download/cominnek-2.5.0.deb)
[![Macos](https://img.shields.io/badge/mac%20os-0078D6?style=for-the-badge&logo=apple&logoColor=white)](https://github.com/Minnek-Digital-Studio/cominnek/releases/latest/download/cominnek-3.0.0.dmg) [![Windows](https://img.shields.io/badge/Windows-0078D6?style=for-the-badge&logo=windows&logoColor=white
)](https://github.com/Minnek-Digital-Studio/cominnek/releases/latest/download/cominnek-3.0.0.exe) [![Linux](https://img.shields.io/badge/Linux-0078D6?style=for-the-badge&logo=linux&logoColor=white)](https://github.com/Minnek-Digital-Studio/cominnek/releases/latest/download/cominnek-3.0.0.deb)

2. Run installer ([See MAC Os steps](#how-to-install-on-mac))

3. Now you can run
```bash
cominnek -v
```

## How to install on Mac

After mounting the installer maybe you would have some issues at the moment to run the installer on Mac since OS blocks the installer app. So you will need to run the `installer.sh` manually.
Expand All @@ -55,6 +57,15 @@ $ cd /Volumes/cominnek-$version/
```bash
$ sudo bash installer.sh
```
# Update

You can get the latest version of `cominnek` by running the following command:

```bash
cominnek update
```



# First steps:

Expand Down Expand Up @@ -111,7 +122,7 @@ the commit will be: `fix(home):{Ticket} do some modifications`

| flag | type | description |
| ------------------ | ------------- | ---------------------------------------|
| `-m --message` |string[] | Receives the commit messange & body message |
| `-m --message` |string[] | Receives the commit message & body message |
| `-M --merge` |string | Receives a Branch to merge after end the push|
| `-F --feat` |string | make the commit with the prefix feat() |
| `-f --fix` |string | make the commit with the prefix fix() |
Expand Down Expand Up @@ -166,7 +177,7 @@ the commit will be: `feat(home):{Ticket} do some modifications`
## Branch
Create a new branch with the prefix `feature/`, `bugfix/`, `hotfix/` or `release/` and the name of the branch will be the ticket number.

At Minnek, we created a variant of Git-flow where the main difference is that we don't merge the branch upon completion. Instead, we create a Github Pull Request.
We are following a Git-Flow variant called [TAYO](https://mnk-docs.ngrok.io/guide/development/version-control/branch-management.html) by Minnek

```bash
cominnek branch feature "<Ticket>"
Expand Down Expand Up @@ -385,7 +396,7 @@ $ cominnek push "Changes in home page" -F "home"

If you want to contribute to this project, please read the [contributing guide](/CONTRIBUTING.md)

Cominnek `V2.5.0`
Cominnek `V3.0.0`
> With ❤ by [isaacismaelx14](https://github.com/isaacismaelx14)

## About
Expand Down
2 changes: 1 addition & 1 deletion assets/windows/bin/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#include "environment.iss"
#define MyAppName "Cominnek"
#define MyAppVersion "2.5.0"
#define MyAppVersion "3.0.0"
#define MyAppPublisher "Minnek Digital Studio"
#define MyAppURL "https://github.com/Minnek-Digital-Studio/cominnek"
#define MyAppExeName "cominnek.exe"
Expand Down
2 changes: 1 addition & 1 deletion config/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var cominnekPath = filepath.Join(userPath, ".cominnek")
var cominnekTempPath = filepath.Join(tempPath, ".cominnek")

var Public = IConfig{
Version: "v2.5.0",
Version: "v3.0.0",
KeyPath: filepath.Join(cominnekPath, "key.bin"),
TokenPath: filepath.Join(cominnekPath, "auth.bin"),
PRBody: filepath.Join(cominnekPath, "pr-body.md"),
Expand Down