Skip to content

Commit

Permalink
Merge pull request #3 from rawlingsj/master
Browse files Browse the repository at this point in the history
chore: add terminal colour to OK status, not able to add red for error states because it affects the formatting of error messages
  • Loading branch information
jenkins-x-bot-test authored Oct 12, 2020
2 parents 5a382e9 + c30b5e6 commit 46ebde2
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 14 deletions.
34 changes: 21 additions & 13 deletions jenkins-x.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
buildPack: go-cli
buildPack: none
dockerRegistryOwner: jenkinsxio
pipelineConfig:
pipelines:
overrides:
- name: helm-template
step:
sh: echo disabled
- name: make-linux
step:
sh: make linux
image: golang:1.15
- name: make-test
step:
sh: make test
image: golang:1.15
pullRequest:
pipeline:
stages:
- agent:
image: golang:1.15
name: ci
options:
containerOptions:
resources:
limits:
cpu: 3
memory: 6072Mi
requests:
cpu: 2
memory: 4048Mi
steps:
- name: test
command: make test
- name: lint
command: make lint

release:
pipeline:
Expand Down
4 changes: 3 additions & 1 deletion pkg/health/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"strings"
"syscall"

"github.com/jenkins-x/jx-helpers/v3/pkg/termcolor"

"github.com/liggitt/tabwriter"

"github.com/jenkins-x/jx-helpers/v3/pkg/knative_pkg/duck"
Expand Down Expand Up @@ -80,7 +82,7 @@ func (o Options) populateTable(checks *khstatecrd.KuberhealthyStateList) [][]str
func (o Options) populateRow(check khstatecrd.KuberhealthyState) [][]string {
var rows [][]string

status := "OK"
status := termcolor.ColorInfo("OK")
if !check.Spec.OK {
status = "ERROR"
}
Expand Down

0 comments on commit 46ebde2

Please sign in to comment.