Skip to content

Commit

Permalink
Simplify CI
Browse files Browse the repository at this point in the history
Move actual CI tests into .travis.yml, and simplify the Debian packaging
Makefile as a result. Feel free to re-add package building to Travis as
another entry in the `scripts:` array.
  • Loading branch information
alexjurkiewicz committed Sep 16, 2018
1 parent 39e01d8 commit 0c625fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 21 deletions.
21 changes: 7 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
language: go # Use go language for shfmt
go:
- master

# Use container-based infrastructure for quicker build start-up
sudo: false
language: minimal

addons:
apt:
sources:
- debian-sid # Grab shellcheck from the Debian repo (o_O)
packages:
- shellcheck

install:
- go get -u github.com/mvdan/sh/cmd/shfmt
before_install:
- go get -u mvdan.cc/sh/cmd/shfmt

script:
- make check

matrix:
fast_finish: true
- shellcheck -e SC1091 acts
- shfmt -i 4 -d acts
- shellcheck -e SC2034 acts.conf.sample
- shfmt -i 4 -d acts.conf.sample
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ package: dist/acts_$(VERSION)_all.deb
clean:
rm -rf dist

check:
shellcheck -s sh -f gcc -e SC1091 acts
shellcheck -s sh -f gcc -e SC2034 acts.conf.sample
@ echo shfmt -l -i 4 acts acts.conf.sample
@ [ -z $(shell shfmt -l -i 4 acts acts.conf.sample) ] || { echo $(shell shfmt -l -i 4 acts acts.conf.sample) && exit 1; }

dist/acts_$(VERSION)_all.deb: dist
@ fpm \
-s dir \
Expand Down Expand Up @@ -39,5 +33,4 @@ dist:

.PHONY: \
package \
check \
clean

0 comments on commit 0c625fa

Please sign in to comment.