Skip to content

Commit

Permalink
Merge pull request #196 from anfernee/fix-test
Browse files Browse the repository at this point in the history
Fix test.sh and enable test on OSX
  • Loading branch information
droot committed May 22, 2018
2 parents 71e189d + 969451b commit 833dc0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ os:
- linux
- osx

matrix:
# allow failures until OSX tests have been tested for a while
allow_failures:
- os: osx

go:
- "1.10"

Expand Down
4 changes: 3 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ function generate_crd_resources {
' pkg/controller/bee/controller.go

header_text "adding a map type to resource"
sed -i -e "s|type BeeSpec struct {|type BeeSpec struct {\n Request map[string]string \`json:\"request,omitempty\"\`|" pkg/apis/insect/v1beta1/bee_types.go
sed -i -e '/type BeeSpec struct {/ a \
Request map[string]string \`json:\"request,omitempty\"\`
' pkg/apis/insect/v1beta1/bee_types.go

header_text "generating and testing CRD definition"
kubebuilder create config --crds --output crd.yaml
Expand Down

0 comments on commit 833dc0f

Please sign in to comment.