Skip to content

Commit 45e2874

Browse files
committed
Use Compose for Travis CI builds.
1 parent b2c312b commit 45e2874

File tree

5 files changed

+20
-32
lines changed

5 files changed

+20
-32
lines changed

.travis.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,23 @@
1-
language: go
21
sudo: required
3-
dist: trusty
42

5-
go:
6-
- "1.10.x"
7-
8-
before_install:
9-
- sudo apt-add-repository -y ppa:mosquitto-dev/mosquitto-ppa
10-
- sudo apt-get -qq update
11-
- sudo apt-get install -y mosquitto
12-
- make requirements
3+
services:
4+
- docker
135

146
script:
15-
- make test
7+
- docker-compose run --rm gatewaybridge make requirements
8+
- docker-compose run --rm gatewaybridge make test
169

1710
before_deploy:
1811
- >
1912
if ! [ "$BEFORE_DEPLOY_RUN" ]; then
2013
export BEFORE_DEPLOY_RUN=1;
2114
22-
make dist;
23-
24-
rvm --default use system;
25-
sudo apt-get install -y ruby ruby-dev;
26-
sudo gem install --no-ri --no-rdoc fpm;
15+
docker-compose run --rm gatewaybridge make dist;
2716
28-
PACKAGE_ARCH=x86_64 make package-deb;
29-
PACKAGE_ARCH=i386 make package-deb;
30-
PACKAGE_ARCH=armhf make package-deb;
31-
PACKAGE_ARCH=arm64 make package-deb;
17+
docker-compose run --rm -e PACKAGE_ARCH=x86_64 gatewaybridge make package-deb;
18+
docker-compose run --rm -e PACKAGE_ARCH=i386 gatewaybridge make package-deb;
19+
docker-compose run --rm -e PACKAGE_ARCH=armhf gatewaybridge make package-deb;
20+
docker-compose run --rm -e PACKAGE_ARCH=arm64 gatewaybridge make package-deb;
3221
3322
mkdir -p dist/upload/tar;
3423
mkdir -p dist/upload/deb;

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.10-alpine AS development
1+
FROM golang:1.11-alpine AS development
22

33
ENV PROJECT_PATH=/go/src/github.com/brocaar/lora-gateway-bridge
44
ENV PATH=$PATH:$PROJECT_PATH/build
@@ -11,7 +11,7 @@ RUN mkdir -p $PROJECT_PATH
1111
COPY . $PROJECT_PATH
1212
WORKDIR $PROJECT_PATH
1313

14-
RUN make requirements
14+
RUN make dev-requirements requirements
1515
RUN make
1616

1717
FROM alpine:latest AS production

Dockerfile-devel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.10-alpine
1+
FROM golang:1.11-alpine
22

33
ENV PROJECT_PATH=/go/src/github.com/brocaar/lora-gateway-bridge
44
ENV PATH=$PATH:$PROJECT_PATH/build
@@ -12,4 +12,4 @@ RUN mkdir -p $PROJECT_PATH
1212
COPY . $PROJECT_PATH
1313
WORKDIR $PROJECT_PATH
1414

15-
RUN make requirements
15+
RUN make dev-requirements

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ test:
2121
@go vet $(PKGS)
2222
@go test -cover -v $(PKGS)
2323

24-
documentation:
25-
@echo "Building documentation"
26-
@mkdir -p dist
27-
@cd docs && hugo
28-
@cd docs/public/ && tar -pczf ../../dist/lora-gateway-bridge-documentation.tar.gz .
29-
3024
dist:
3125
@goreleaser
3226

@@ -36,11 +30,13 @@ snapshot:
3630
package-deb: dist
3731
@cd packaging && TARGET=deb ./package.sh
3832

39-
requirements:
33+
dev-requirements:
4034
go get -u github.com/golang/lint/golint
4135
go get -u github.com/kisielk/errcheck
4236
go get -u github.com/golang/dep/cmd/dep
4337
go get -u github.com/goreleaser/goreleaser
38+
39+
requirements:
4440
dep ensure -v
4541

4642
# shortcuts for development

docs/content/community/source.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ Gateway Bridge repository has been cloned to
4141
A few example commands that you can run:
4242

4343
{{<highlight bash>}}
44-
# install all requirements
44+
# install development requirements
45+
make dev-requirements
46+
47+
# install requirements
4548
make requirements
4649

4750
# run the tests

0 commit comments

Comments
 (0)