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

Bump the version of jcli #2

Merged
merged 1 commit into from
Nov 24, 2020
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
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
build:
build: pre-build
go build
chmod u+x jcli-account-plugin

vet:
go vet ./...

pre-build: fmt vet
export GO111MODULE=on
export GOPROXY=https://goproxy.io
go mod tidy

copy:
cp jcli-account-plugin ~/.jenkins-cli/plugins

Expand Down
6 changes: 3 additions & 3 deletions cmd/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"crypto/tls"
"fmt"
"github.com/ghodss/yaml"
"github.com/jenkins-zh/jenkins-cli/util"
"github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
Expand All @@ -13,6 +12,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/transport/client"
githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
gitssh "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
"gopkg.in/yaml.v2"
"io/ioutil"
"net/http"
"os"
Expand Down Expand Up @@ -115,8 +115,8 @@ func (c *accountCmd) getPullOptions() (pullOptions *git.PullOptions) {
func (c *accountCmd) getPushOptions() (pushOptions *git.PushOptions) {
pushOptions = &git.PushOptions{
RemoteName: "origin",
Auth: c.getAuth(),
Progress: c.output,
Auth: c.getAuth(),
Progress: c.output,
}
return
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/account_commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func NewAccountCommitCmd(args []string, accountCmd *accountCmd) (cmd *cobra.Comm
cmd = &cobra.Command{
Use: "commit",
Short: "Commit the changes of current account",
Long: `Commit and push the changes of current account`,
Long: `Commit and push the changes of current account`,
PreRunE: accountCommitCmd.preRunE,
RunE: accountCommitCmd.Run,
}
Expand Down Expand Up @@ -60,7 +60,7 @@ func (c *accountCommitCmd) Run(cmd *cobra.Command, args []string) (err error) {
opts := &git.CommitOptions{
All: true,
Author: &object.Signature{
Name: "jcli",
Name: "jcli",
Email: "jcli@github.com",
},
}
Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ module github.com/jenkins-zh/jcli-account-plugin
go 1.13

require (
github.com/ghodss/yaml v1.0.0
github.com/jenkins-zh/jenkins-cli v0.0.0-20200420140323-2b202173e6aa
github.com/jenkins-zh/jenkins-cli v0.0.31
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.0.0
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
github.com/spf13/cobra v1.1.1
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2 v2.3.0
)
Loading