Skip to content

Commit

Permalink
Fix Travis releases (#511)
Browse files Browse the repository at this point in the history
Signed-off-by: liz <liz@heptio.com>
  • Loading branch information
liztio authored and timothysc committed Jul 27, 2018
1 parent 81a3cb8 commit 7b18b7a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Build artifacts
/sonobuoy
build/

# we output results to this directory by default
/archive
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ services:

install: true


script: VERBOSE=true make test int

before_install:
# Install gcloud cli here so it gets cached
- if [ ! -d ${HOME}/google-cloud-sdk ]; then
curl https://sdk.cloud.google.com | bash /dev/stdin --disable-prompts;
fi
# go get doesn't seem to work in deploy step, so fetch it here instead
- go get -u github.com/estesp/manifest-tool

deploy:
- provider: script
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ LINUX_ARCH := amd64 arm64
DOCKERFILE :=
PLATFORMS := $(subst $(SPACE),$(COMMA),$(foreach arch,$(LINUX_ARCH),linux/$(arch)))

GIT_VERSION ?= $(shell git describe --always --dirty)
IMAGE_VERSION ?= $(shell git describe --always --dirty)
# --tags allows detecting non-annotated tags as well as annotated ones
GIT_VERSION ?= $(shell git describe --always --dirty --tags)
IMAGE_VERSION ?= $(shell git describe --always --dirty --tags)
IMAGE_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD | sed 's/\///g')
GIT_REF = $(shell git rev-parse --short=8 --verify HEAD)

Expand Down
Binary file modified heptio-images-ee4b0474b93e.json.enc
Binary file not shown.
2 changes: 2 additions & 0 deletions travis-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

# Don't fail silently when a step doesn't succeed
set -e

if [ -z "$TRAVIS" ]; then
echo "this script is intended to be run only on travis" >&2
Expand Down

0 comments on commit 7b18b7a

Please sign in to comment.