Skip to content

Commit

Permalink
propagate ci variables to the build container; fix #192
Browse files Browse the repository at this point in the history
Signed-off-by: Denys Smirnov <[email protected]>
  • Loading branch information
Denys Smirnov authored and dennwc committed Oct 10, 2018
1 parent 8e3fa88 commit 6ab65e2
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ VERSION ?= $(DEV_PREFIX)-$(GIT_COMMIT)$(GIT_DIRTY)

# Go parameters
GO_CMD = go
GO_BUILD = $(GO_CMD) build -tags ostree
GO_GET = $(GO_CMD) get -v
GO_TEST = $(GO_CMD) test -v

Expand Down Expand Up @@ -160,8 +161,11 @@ push-drivers: build-drivers
fi;

packages: dependencies docker-build
$(if $(pushdisabled),$(error $(pushdisabled)))
$(DOCKER_RUN) -v $(GOPATH):/go $(DOCKER_BUILD_IMAGE) make packages-internal
$(DOCKER_RUN) -v $(BUILD_PATH):/go/src/$(GO_PKG)/build \
-e TRAVIS_BRANCH=$(TRAVIS_BRANCH) \
-e TRAVIS_TAG=$(TRAVIS_TAG) \
-e TRAVIS_PULL_REQUEST=$(TRAVIS_PULL_REQUEST) \
$(DOCKER_BUILD_IMAGE) make packages-internal

packages-internal: $(COMMANDS)

Expand Down

0 comments on commit 6ab65e2

Please sign in to comment.