gomerge is a tool to quickly bulk merge several pull requests from your terminal.

Last update: Dec 28, 2022

Overview

gomerge

Description

Gomerge is a tool to quickly enable you to bulk merge Github pull requests from your terminal. The intention of this tool is to simplfy, and eventually automate the merging of github pull requests. This tool should be able to run on most systems.

Requirements

You must have created a github personal access token (PAT) to use this tool. For information on how to do so, you can follow the documentation https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token

Install

To install the latest version via homebrew, please run the following.

brew tap Cian911/gomerge
brew install gomerge

// Check the binary is working as expected.
gomerge -h

To install the compiled binary, you can go to the releases tab, and download the version most suitable to your environment. An example of such is below.

wget https://github.com/Cian911/gomerge/releases/download/1.1.1/gomerge_1.1.1_Linux_x86_64.tar.gz
sudo tar -xvf gomerge_1.1.1_Linux_x86_64.tar.gz -C /usr/local/bin/
sudo chmod +x /usr/local/bin/gomerge

Usage

Below denotes the available commands and flags on the gomerge tool.

Gomerge makes it simple to merge an open pull request from your terminal.

Usage:
  gomerge [command]

Available Commands:
  help        Help about any command
  list        List all open pull request for a repository you wish to merge.

Flags:
  -c, --config string   Pass an optional config file as an argument with list of repositories.
  -h, --help            help for gomerge
  -r, --repo string     Pass name of repository as argument (organization/repo).
  -t, --token string    Pass your github personal access token (PAT).

Use "gomerge [command] --help" for more information about a command.

To get a list of open and active pull requests for a given repo, you can run the following command.

N.B: Please ensure to add your organization followed by the name of your repository. In most cases this will be your github username, but if referencing a repository that exists within an organization you have access to, be sure to substitute it for that E.G google/example-repo.

gomerge list -r Cian911/go-merge -t ${GITHUB_TOKEN}

If there are any active and open pull requests for your given repository, you will see an output similar to below.

From here, follow the instructions to select which pull request you wish to merge, and hit enter. Your pull request should now have been merged, and you should get a similar message to below.

PR #3: Pull Request successfully merged.

Bulk Merging Pull Requests

As of version 1.1.0 there is a new option available to pass a config.yaml as an arugment to the gomerge tool which will give the user the option to configure a list of repositories in order to more easily bulk merge pull requests.

You should first create a config.yaml file in the following format.

organization: Cian911
repositories:
- pr-test
- syncwave

You can then run the tool like so, passing the config file as a flag.

gomerge list -t $GITHUB_TOKEN -c config.yaml

You should see a list of active and open pull requets from the repositories you have defined in your configuration file.

Comments

SIGSEGV: segmentation violation

blu@minopia:~/github/repos $ ./gomerge_list.sh
No open pull requests found for configured repositories.
+----+-------+--------------------------------+---------------------------------------+----------------------+
| PR | STATE |             TITLE              |              REPOSITORY               |       CREATED        |
+----+-------+--------------------------------+---------------------------------------+----------------------+
| #2 | open  | Update                         | xxx/xxx | 2021-03-10T05:47:18Z |
|    |       | xxx    |                                       |                      |
|    |       | xxx           |                                       |                      |
+----+-------+--------------------------------+---------------------------------------+----------------------+
? Select which Pull Requests you would like to merge. 2 | xxx                                                   2022/09/26 01:11:18 Could not merge PR #2, skipping: PUT https://api.github.com/repos/xxx/xxx/pulls/2/merge: 404 Not Found []
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x2c8f28]

goroutine 1 [running]:
github.com/cian911/go-merge/pkg/gitclient.MergePullRequest(0x4000166500, {0x4fbe70, 0x40000b0000}, {0x40000b1330, 0xb}, {0x40004d0a22, 0x19}, 0x2, {0x0, 0x0}, ...)
        /home/runner/work/gomerge/gomerge/pkg/gitclient/client.go:50 +0x198
github.com/cian911/go-merge/pkg/cli/list.NewCommand.func1(0x4000152c80, {0x40000a2a00, 0x0, 0x5})
        /home/runner/work/gomerge/gomerge/pkg/cli/list/list.go:94 +0xa00
github.com/spf13/cobra.(*Command).execute(0x4000152c80, {0x40000a29b0, 0x5, 0x5})
        /home/runner/go/pkg/mod/github.com/spf13/[email protected]/command.go:876 +0x66c
github.com/spf13/cobra.(*Command).ExecuteC(0x4000152a00)
        /home/runner/go/pkg/mod/github.com/spf13/[email protected]/command.go:990 +0x424
github.com/spf13/cobra.(*Command).Execute(...)
        /home/runner/go/pkg/mod/github.com/spf13/[email protected]/command.go:918
github.com/spf13/cobra.(*Command).ExecuteContext(...)
        /home/runner/go/pkg/mod/github.com/spf13/[email protected]/command.go:911
main.main()
        /home/runner/work/gomerge/gomerge/cmd/gomerge/main.go:22 +0x168

bug wip

opened by Bluscream 10

FEATURE: Windows OS support

I was planning on using this tool to manage some of my repos, but I'm on Windows 🙂.

There's no prebuilt binaries. For now, I'll attempt to build from source. I assume that this will work? I haven't dug deep enough to see if anything is unix-specific
enhancement user-request in-progress

opened by scowalt 5
ENHANCEMENT: Add golint as workflow job

In order to improve the code quality of gomerge, we should implement a number of automated code quality checks.

This issue related specifically to golint. This should be implemented as a job in the https://github.com/Cian911/gomerge/blob/master/.github/workflows/test.yml workflow file. This should run before the main test suite and should fail the entire workflow if a change fails.
enhancement help wanted good first issue

opened by Cian911 2
Build(deps): Bump github.com/stretchr/testify from 1.8.0 to 1.8.1
Bumps github.com/stretchr/testify from 1.8.0 to 1.8.1.

Commits

b747d7c Bump github.com/stretchr/objx from 0.4.0 to 0.5.0 (#1283)

See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1
Build(deps): Bump github.com/spf13/cobra from 1.5.0 to 1.6.0
Bumps github.com/spf13/cobra from 1.5.0 to 1.6.0.

Release notes

Sourced from github.com/spf13/cobra's releases.

v1.6.0

Summer 2022 Release

Some exciting changes make their way to Cobra! Command completions continue to get better and better (including adding --help and --version automatic flags to the completions list). Grouping is now possible in your help output as well! And you can now use the OnFinalize method to cleanup things when all "work" is done. Checkout the full changelog below:

Features 🌠

Add groups for commands in help: @aawsome @marckhouzam #1003

Support for case-insensitive command names: @YuviGold #1802

Expose ValidateRequiredFlags and ValidateFlagGroups: @skeetwu #1760

Add --version flag to help output: @fnickels #1707

Add --help and --version flag in completions: @marckhouzam #1813

Add OnFinalize method: @yann-soubeyrand #1788

Allow user to add completion for powershell alias: @marckhouzam #1621

Make InitDefaultcompletionCmd public: @gssbzn #1467

Deprecation 👎🏼

ExactValidArgs is deprecated (but not being removed entirely). This is abit nuanced, so checkout #1643 for further information and the updated user_guide.md on how this may affect you (and how you can take advantage of the correct behavior in the validators): @umarcor #1643

Bug fixes 🐛

Fix (bash-v2) activeHelp length check syntax: @scop #1762

Fix correct command path in see_also for yaml documentation: @zregvart #1771

Fix showing flags that shadow parent persistent flag in child help messaging: @brianpursley #1776

Dependencies 🗳️

Upgrade to use gopkg.in/yaml.v3: @tklauser #1766

Testing 🤔

Test on Golang 1.19: @umarcor & @jpmcb #1782

Renamed powershell completion tests: @marckhouzam #1803

Use action/setup-go cache: @umarcor #1783

Add workflow_dispatch to CI actions: @umarcor #1387

Add minimum GitHub token permissions for workflows: @varunsh-coder #1792

Docs ✏️

Fixup spelling for GitHub CLI: @eltociear #1744

Clarify SetContext documentation: @katexochen #1748

Instruct user to go install for binary: @marckhouzam #1726

User guide cleanup: @marckhouzam #1656

Document option to hide the default completion command: @marckhouzam #1779

Misc 💭

Add KubeVirt, CloudQuery, Cilium, Okteto, Zitadel, Allero to projects using cobra: @maiqueb #1741, @yevgenypats #1742, @tklauser #1745, @jLopezbarb #1759, @fforootd #1772, @dimabru #1819

Use correct stale action exempt yaml keys: @jpmcb #1800

Add missing license headers: @umarcor #1809

Note: Per #1804, we will be moving away from "seasonal" releases and doing more generic point release targets. Continue to track the milestones and issues in the spf13/cobra GitHub repository for more information!

Great work everyone! Cobra would never be possible without your contributions! 🐍

... (truncated)

Commits

8607918 feat: make InitDefaultCompletionCmd public (#1467)

2169adb Add groups for commands in help (#1003)

212ea40 Include --help and --version flag in completion (#1813)

d4040ad Allow user to add completion for powershell alias (#1621)

23fc5e0 ci: add minimum GitHub token permissions for workflows (#1792)

93d1913 Add OnFinalize method (#1788)

07034fe build(deps): bump actions/stale from 5 to 6 (#1815)

3dc9761 Add allero to list of projects using cobra (#1819)

7039e1f Add '--version' flag to Help output (#1707)

fce8d8a Expose ValidateRequiredFlags and ValidateFlagGroups (#1760)

Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1

[Tutorial] How to use this on all your repos

First use this to cache all repositories you have access to locally

import github.GithubException
from github import Github
from time import sleep
from pathlib import Path
from json import dump, dumps
from os import makedirs

dir = Path("repos")

github_instance = Github(YOUR_GITHUB_TOKEN_HERE)
# f = file.open(mode="w+", encoding="utf-8")
for repo in github_instance.get_user().get_repos():
    orgpath = dir / f"{repo.owner.login}"
    if not orgpath.exists(): makedirs(orgpath)
    filepath = orgpath / f"{repo.name}.json"
    err = None
    try: raw_str = dumps(repo.raw_data, indent=4)
    except github.GithubException as e:
        err = e
        filepath = orgpath / f"{repo.name}.txt"
    if not filepath.exists():
        print("New file for repo", filepath)
        with open(filepath, 'w') as f:
            if not err: f.write(raw_str)
            else: f.write(str(err))
        # file.write_text(f"{repo.name};{repo.description};{repo.language};{repo.created_at};{repo.default_branch};{repo.size};{repo.pushed_at};{repo.forks_count};{}")
        sleep(.01)

then use this to generate config files and a shell script for gomerge:

import github.GithubException
from github import Github
from time import sleep
from pathlib import Path
import json
from os import makedirs
import yaml
root = Path("repos")

github_token = YOUR_GITHUB_TOKEN_HERE
# github_instance = Github()


def get_users(dir: Path):
    orgs = {}
    for org in dir.glob('*/'):
        if org.is_file(): continue
        orgs[org.name] = []
        # print("Found new org", org.name)
        for repo in org.glob("*.json"):
            # print("Found new repo", repo.name)
            orgs[org.name].append(repo.stem)
    print("Loaded", sum([len(l) for l in orgs]), "repos from", len(orgs), "orgs/users")
    return orgs
# def get_repos(Path: dir):
    # repos = []
    # dirs = 0
    # for path_object in dir.glob('**/*'):
        # if path_object.is_dir(): dirs += 1; continue
        # if not path_object.name.endswith(".json"): continue
        # with path_object.open() as f:
            # try:  repos.append(json.load(f))
            # except: print("Failed to parse json file",path_object)
    # print("Loaded", len(repos), "repos from", len(dirs), "orgs/users")
    # return repos


# files = get_repos(root)
orgs = get_users(root)

sh_merge = Path(root / "gomerge.sh").open("w", newline='\n')
sh_list = Path(root / "gomerge_list.sh").open("w", newline='\n')
sh_close = Path(root / "gomerge_close.sh").open("w", newline='\n')
for org, repos in orgs.items():
    cfg = Path(root / org / "config.yaml")
    yml = { "organization": org, "repositories": repos }
    with cfg.open("w") as cfgf: yaml.dump(yml, cfgf)
    sh_merge.write(f"gomerge list -t {github_token} -c {org}/config.yaml -a -s\n")
    sh_list.write(f"gomerge list -t {github_token} -c {org}/config.yaml -s\n")
    sh_close.write(f"gomerge list -t {github_token} -c {org}/config.yaml --close -s\n")

then just run repos/gomerge.sh on your machine

documentation enhancement

opened by Bluscream 1

Build(deps): Bump github.com/spf13/viper from 1.12.0 to 1.13.0
Bumps github.com/spf13/viper from 1.12.0 to 1.13.0.

Release notes

Sourced from github.com/spf13/viper's releases.

v1.13.0

Important: This is the last release supporting Go 1.15.

What's Changed

Exciting New Features 🎉

Add etcd3 to supported remote providers by @franklinkim in spf13/viper#1371

Enhancements 🚀

Fix go-staticcheck failures (ST1005) by @mjmaisey in spf13/viper#1373

Use jsonc in markdown codeblocks for better readability by @HurSungYun in spf13/viper#1393

Add Go 1.19 support by @sagikazarmark in spf13/viper#1424

Adds support for uint16 with GetUint16 by @oxisto in spf13/viper#1405

Add a DebugTo convenience funtion by @bcrochet in spf13/viper#1414

Bug Fixes 🐛

Recurse into arrays when converting keys to lowercase by @awrichar in spf13/viper#1387

Dependency Updates ⬆️

build(deps): bump github.com/stretchr/testify from 1.7.1 to 1.7.2 by @dependabot in spf13/viper#1374

build(deps): bump github.com/subosito/gotenv from 1.3.0 to 1.4.0 by @dependabot in spf13/viper#1375

build(deps): bump github.com/pelletier/go-toml/v2 from 2.0.1 to 2.0.2 by @dependabot in spf13/viper#1378

build(deps): bump gopkg.in/yaml.v3 from 3.0.0 to 3.0.1 by @dependabot in spf13/viper#1360

build(deps): bump github.com/stretchr/testify from 1.7.2 to 1.7.3 by @dependabot in spf13/viper#1381

build(deps): bump github.com/stretchr/testify from 1.7.3 to 1.7.4 by @dependabot in spf13/viper#1384

build(deps): bump mheap/github-action-required-labels from 1 to 2 by @dependabot in spf13/viper#1383

build(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0 by @dependabot in spf13/viper#1395

build(deps): bump github.com/subosito/gotenv from 1.4.0 to 1.4.1 by @dependabot in spf13/viper#1420

build(deps): bump github.com/pelletier/go-toml/v2 from 2.0.2 to 2.0.5 by @dependabot in spf13/viper#1422

build(deps): bump gopkg.in/ini.v1 from 1.66.4 to 1.67.0 by @dependabot in spf13/viper#1412

New Contributors

@mjmaisey made their first contribution in spf13/viper#1373

@HurSungYun made their first contribution in spf13/viper#1393

@franklinkim made their first contribution in spf13/viper#1371

@awrichar made their first contribution in spf13/viper#1387

@oxisto made their first contribution in spf13/viper#1405

@bcrochet made their first contribution in spf13/viper#1414

Full Changelog: https://github.com/spf13/viper/compare/v1.12.0...v1.13.0

Commits

57cc9a0 test: fix ini tests

8030d5b build(deps): bump gopkg.in/ini.v1 from 1.66.4 to 1.67.0

312417a Add a DebugTo convenience funtion

202060b Adds support for uint16 with GetUint16

97591f0 build: fix lint violations

9af8dae ci: upgrade golangci-lint

7b4f2b2 ci: add Go 1.19 to CI

601ec81 test: fix toml tests

d7f4832 build(deps): bump github.com/pelletier/go-toml/v2 from 2.0.2 to 2.0.5

c2f42f3 build(deps): bump github.com/subosito/gotenv from 1.4.0 to 1.4.1

Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1
Bump github.com/stretchr/testify from 1.7.0 to 1.7.5
Bumps github.com/stretchr/testify from 1.7.0 to 1.7.5.

Commits

b5ce165 fixing panic in calls to assertion with nil m.mutex (#1212)

c206b2e Mock can be deadlocked by a panic (#1157)

1b73601 suite: correctly set stats on test panic (#1195)

ba1076d Add .Unset method to mock (#982)

c31ea03 Support comparing byte slice (#1202)

48391ba Fix panic in AssertExpectations for mocks without expectations (#1207)

840cb80 arrays value types in a zero-initialized state are considered empty (#1126)

07dc7ee Bump actions/setup-go from 3.1.0 to 3.2.0 (#1191)

c33fc8d Bump actions/checkout from 2 to 3 (#1163)

3c33e07 Added Go 1.18.1 as a build/supported version (#1182)

Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1
Bump github.com/spf13/cobra from 1.4.0 to 1.5.0
Bumps github.com/spf13/cobra from 1.4.0 to 1.5.0.

Release notes

Sourced from github.com/spf13/cobra's releases.

v1.5.0

Spring 2022 Release 🌥️

Hello everyone! Welcome to another release of cobra. Completions continue to get better and better. This release adds a few really cool new features. We also continue to patch versions of our dependencies as they become available via dependabot. Happy coding!

Active help 👐🏼

Shout out to @marckhouzam for a big value add: Active Help spf13/cobra#1482. With active help, a program can provide some inline warnings or hints for users as they hit tab. Now, your CLIs can be even more intuitive to use!

Currently active help is only supported for bash V2 and zsh. Marc wrote a whole guide on how to do this, so make sure to give it a good read to learn how you can add this to your cobra code! https://github.com/spf13/cobra/blob/master/active_help.md

Group flags 🧑🏼‍🤝‍🧑🏼

Cobra now has the ability to mark flags as required or exclusive as a group. Shout out to our newest maintainer @johnSchnake for this! spf13/cobra#1654 Let's say you have a username flag that MUST be partnered with a password flag. Well, now, you can enforce those as being required together:

rootCmd.Flags().StringVarP(&u, "username", "u", "", "Username (required if password is set)") rootCmd.Flags().StringVarP(&pw, "password", "p", "", "Password (required if username is set)") rootCmd.MarkFlagsRequiredTogether("username", "password")

Flags may also be marked as "mutally exclusive" with the MarkFlagsMutuallyExclusive(string, string ... ) command API. Refer to our user guide documentation for further info!

Completions 👀

Add backwards-compatibility tests for legacyArgs() by @marckhouzam in spf13/cobra#1547

feat: Add how to load completions in your current zsh session by @ondrejsika in spf13/cobra#1608

Introduce FixedCompletions by @emersion in spf13/cobra#1574

Add shell completion to flag groups by @marckhouzam in spf13/cobra#1659

Modify brew prefix path in macOS system by @imxw in spf13/cobra#1719

perf(bash-v2): use backslash escape string expansion for tab by @scop in spf13/cobra#1682

style(bash-v2): out is not an array variable, do not refer to it as such by @scop in spf13/cobra#1681

perf(bash-v2): standard completion optimizations by @scop in spf13/cobra#1683

style(bash): out is not an array variable, do not refer to it as such by @scop in spf13/cobra#1684

perf(bash-v2): short-circuit descriptionless candidate lists by @scop in spf13/cobra#1686

perf(bash-v2): speed up filtering entries with descriptions by @scop in spf13/cobra#1689

perf(bash-v2): speed up filtering menu-complete descriptions by @scop in spf13/cobra#1692

fix(bash-v2): skip empty completions when filtering descriptions by @scop in spf13/cobra#1691

perf(bash-v2): read directly to COMPREPLY on descriptionless short circuit by @scop in spf13/cobra#1700

fix: Don't complete _command on zsh by @twpayne in spf13/cobra#1690

Improve fish_completions code quality by @t29kida in spf13/cobra#1515

Fix handling of descriptions for bash v3 by @marckhouzam in spf13/cobra#1735

undefined or nil Args default to ArbitraryArgs by @umarcor in spf13/cobra#1612

Add Command.SetContext by @joshcarp in spf13/cobra#1551

Wrap printf tab with quotes by @PapaCharlie in spf13/cobra#1665

Documentation 📝

Fixed typos in completions docs - @cuishuang spf13/cobra#1625

Removed CHANGELOG.md as it isn't updated - @johnSchnake spf13/cobra#1634

Minor typo fix in shell_completion.md - @danieldn spf13/cobra#1678

Changed branch name in the cobra generator link to 'main' - @skywalker2909 spf13/cobra#1645

Fix Command.Context comment by @katexochen in spf13/cobra#1639

... (truncated)

Commits

06b06a9 Bump golangci/golangci-lint-action from 3.1.0 to 3.2.0 (#1697)

5f2ec3c Update shell completion to respect flag groups (#1659)

b9ca594 use errors.Is() to check for errors (#1730)

ea94a3d undefined or nil Args default to ArbitraryArgs (#1612)

7c9831d Fix handling of descriptions for bash v3 (#1735)

ed7bb9d Add unit test for fish completion (#1515)

f464d6c Add Active Help support (#1482)

7dc8b00 Bump actions/setup-go from 2 to 3 (#1660)

87ea180 Modify brew prefix path in macOS system (#1719)

ca8e3c2 Add Pulumi as a project using cobra (#1720)

Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1
Bump github.com/stretchr/testify from 1.7.0 to 1.7.4
Bumps github.com/stretchr/testify from 1.7.0 to 1.7.4.

Commits

48391ba Fix panic in AssertExpectations for mocks without expectations (#1207)

840cb80 arrays value types in a zero-initialized state are considered empty (#1126)

07dc7ee Bump actions/setup-go from 3.1.0 to 3.2.0 (#1191)

c33fc8d Bump actions/checkout from 2 to 3 (#1163)

3c33e07 Added Go 1.18.1 as a build/supported version (#1182)

e2b56b3 Bump github.com/stretchr/objx from 0.1.0 to 0.4.0

41453c0 Update gopkg.in/yaml.v3

285adcc Update go versions in build matrix

6e7fab4 Bump actions/setup-go from 2 to 3.1.0

106ec21 use RWMutex

Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1
Bump github.com/AlecAivazis/survey/v2 from 2.3.2 to 2.3.5
Bumps github.com/AlecAivazis/survey/v2 from 2.3.2 to 2.3.5.

Release notes

Sourced from github.com/AlecAivazis/survey/v2's releases.

v2.3.5

No release notes provided.

v2.3.4

What's Changed

Fix Survey output on Windows by @mislav in AlecAivazis/survey#413

Add terminal.Cursor error handling on Windows by @mislav in AlecAivazis/survey#414

Full Changelog: https://github.com/AlecAivazis/survey/compare/v2.3.3...v2.3.4

v2.3.3

No release notes provided.

Commits

e47352f Fix README formatting for select descriptions (#426)

c2be27f Added an option to add a comment to every select's option (#418)

93657ef Enable compilation under Go 1.18 (#417)

459523e Add terminal.Cursor error handling on Windows (#414)

6cbb195 Fix Survey output on Windows (#413)

c07023a Skip vi-dependent tests when there is no vi in PATH (#397)

099a968 Fix multiple validator inconsistency (#401)

1b28f27 fix: ensure terminal has required read settings in non-canonical mode (#409)

bcabe24 Stricter error handling in tests (#404)

3cabaff Drop proprietary runner dependency in favor of go tooling (#403)

Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR

@dependabot recreate will recreate this PR, overwriting any edits that have been made to it

@dependabot merge will merge this PR after your CI passes on it

@dependabot squash and merge will squash and merge this PR after your CI passes on it

@dependabot cancel merge will cancel a previously requested merge and block automerging

@dependabot reopen will reopen this PR if it is closed

@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)

@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependencies
opened by dependabot[bot] 1
ENHANCEMENT: Add gofmt

In order to improve the code quality of gomerge, we should implement a number of automated code quality checks.

This issue related specifically to gofmt. This should be added a pre-commit hook to ensure all commits maintain the go standard. It would be nice to have this as a command available to be run via the existing Makefile too.

Implementing this enhancement may bring to light formatting changes across multiple files. This is fine, a requirement for this should be that all relevant go files are formatted correctly.
enhancement help wanted good first issue

opened by Cian911 0
ENHANCEMENT: Add govet as workflow job

In order to improve the code quality of gomerge, we should implement a number of automated code quality checks.

This issue related specifically to govet. This should be implemented as a job in the https://github.com/Cian911/gomerge/blob/master/.github/workflows/test.yml workflow file. This should run before the main test suite and should fail the entire workflow if a change fails.
enhancement help wanted good first issue

opened by Cian911 0
ENHANCEMENT: Add workflow to create and push new tags on merge to master

We should have a github workflow file that bumps the version tag for git and pushes it to trigger the release workflow. This therefore necessitates the need for a version file that should be bump accordingly on each pull request to master.
enhancement good first issue

opened by Cian911 6
FEATURE: Display CI status on Pull requests

As a developer I want to be able to see whether the CI on an active pull request/s has passed/failed/in-progress.

REF: https://www.producthunt.com/posts/gomerge
enhancement Hacktoberfest

opened by Cian911 0