Skip to content
This repository has been archived by the owner on Aug 27, 2019. It is now read-only.

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
alima committed Aug 19, 2019
2 parents 38d7c0b + a53cd6c commit e23dbca
Show file tree
Hide file tree
Showing 37 changed files with 649 additions and 918 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/.gopath/
/uhc
/vendor/
22 changes: 22 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
run:
deadline: 15m
issues-exit-code: 1
modules-download-mode: readonly
linters:
disable-all: true
enable:
- deadcode
- gas
- goconst
- gocyclo
- gofmt
- golint
- ineffassign
- interfacer
- lll
- maligned
- megacheck
- misspell
- structcheck
- unconvert
- varcheck
32 changes: 23 additions & 9 deletions build_deploy.sh → .goreleaser.yaml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,26 @@
# limitations under the License.
#

# This script is executed by a Jenkins job for each change request. If it
# doesn't succeed the change won't be merged.

# make and rename binary
make
mv uhc uhc-linux-amd64

# calculate SHA 256 hash of the uhc binary
sha256sum uhc-linux-amd64 > uhc-linux-amd64.sha256
project_name: uhc
builds:
-
env:
- CGO_ENABLED=0
goarch:
- amd64
ignore:
- goos: darwin
archives:
-
name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
checksum:
name_template: 'uhc-linux-amd64.sha256'
algorithm: sha256
release:
name_template: "Release {{.Tag}}"
changelog:
sort: asc
filters:
exclude:
- '^docs:'
- '^test:'
19 changes: 19 additions & 0 deletions CHANGES.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
This document describes the relevant changes between releases of the
`uhc` command line tool.

== 0.1.19 Aug 15 2019

- Fixed issue https://github.com/openshift-online/uhc-cli/pull/62[#62]: the
`--url` option of the `login` command should not be mandatory.

== 0.1.18 Aug 14 2019

- Improvements in the `cluster list` command, including increasing the size of
the _name_ column.

- Added new `orgs` command to list organizations.

- Added new `account orgs` command to list organizations for the current
account.

- Print roles of current user with the `account status` command.

- Add filter positional argument to the `cluster list` command.

== 0.1.17 Jul 2 2019

- Added the `account` command.
Expand Down
Loading

0 comments on commit e23dbca

Please sign in to comment.