Skip to content

Commit

Permalink
clarifies package and gets rid of old empty test stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
s1cyan committed Apr 22, 2020
1 parent a56a18b commit 1eebe6d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
13 changes: 2 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,9 @@ stages:
- name: test
- name: deploy
if: tag IS present

install-controller: &install-controller
install:
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
# - make install-controller
# manually set the list of stacks to test
# the stacks repo will generate their own list of stacks that have changed and should be tested
- export STACKSLIST=incubator/nodejs

test-template: &test-template
test-template: &test-template #empty test
stage: test
<<: *install-controller
script: make test

standard-deploy-template: &standard-deploy-template
Expand Down Expand Up @@ -90,7 +81,7 @@ jobs:
name: Deploy Release win/linux
env:
- ARCH=amd64
- PACKAGE=package
- PACKAGE=package-win-and-linux
- <<: *standard-deploy-template
name: Deploy Release P
arch: ppc64le
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ build-windows: ## Build the windows binary
build-linux build-darwin build-windows: ## Build the binary of the respective operating system
GOOS=$(os) GOARCH=$(ARCH) go build -o $(BUILD_PATH)/$(build_binary) -ldflags "-X main.VERSION=$(VERSION)"

.PHONY: package
package: tar-linux tar-windows ## Creates packages for all operating systems and store them in package/ dir
.PHONY: package-win-and-linux
package-win-and-linux: tar-linux tar-windows ## Creates packages for all operating systems and store them in package/ dir
# package: tar-linux deb-linux rpm-linux tar-darwin brew-darwin tar-windows ## Creates packages for all operating systems and store them in package/ dir

.PHONY: package-osx
Expand Down

0 comments on commit 1eebe6d

Please sign in to comment.