Skip to content

Commit 6b96fb7

Browse files
authored
Merge pull request #44 from Clivern/feature/go-modules
Switch from dep to go modules
2 parents 26b6900 + f3dfb32 commit 6b96fb7

26 files changed

+167
-399
lines changed

.goreleaser.yml

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
1-
# goreleaser release --skip-publish --snapshot
2-
build:
3-
goos:
4-
- linux
5-
- darwin
6-
- windows
7-
goarch:
8-
- 386
9-
- amd64
10-
- arm
11-
- arm64
12-
ignore:
13-
- goos: darwin
14-
goarch: 386
1+
builds:
2+
- env:
3+
- CGO_ENABLED=0
154
archive:
165
replacements:
176
darwin: Darwin
187
linux: Linux
198
windows: Windows
209
386: i386
2110
amd64: x86_64
22-
format_overrides:
23-
- goos: windows
24-
format: zip
25-
brew:
26-
github:
27-
owner: clivern
28-
name: beaver
29-
folder: Formula
30-
homepage: https://github.com/clivern/beaver
31-
description: A Real Time Messaging Server
32-
dependencies:
33-
- git
34-
nfpm:
35-
homepage: https://github.com/clivern/beaver
36-
description: A Real Time Messaging Server
37-
maintainer: A.F <hello@clivern.com>
38-
vendor: Beaver
39-
formats:
40-
- deb
41-
dependencies:
42-
- git
11+
checksum:
12+
name_template: 'checksums.txt'
13+
snapshot:
14+
name_template: "{{ .Tag }}-next"
15+
changelog:
16+
sort: asc
17+
filters:
18+
exclude:
19+
- '^docs:'
20+
- '^test:'

.travis.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
language: go
22

3+
# needed for the nfpm pipe
4+
addons:
5+
apt:
6+
packages:
7+
- rpm
8+
39
services:
410
- redis-server
511

@@ -9,6 +15,9 @@ go:
915
- 1.11.x
1016
- master
1117

18+
env:
19+
- GO111MODULE=on
20+
1221
install: true
1322

1423
# Fix this by renaming the directory before testing.
@@ -23,9 +32,28 @@ script:
2332
- cd clivern/beaver
2433
- mv config.travis.yml config.test.yml
2534
# Config & execute ci tasks
26-
- make install_dep
2735
- make install_revive
28-
- make ensure_dep
2936
- cp config.yml config.dist.yml
3037
- make ci
38+
# Workaround to clear any package used for testing only
39+
- git status
40+
- git diff > diff.log
41+
- cat diff.log
42+
- git clean -fd
43+
- git reset --hard
44+
45+
matrix:
46+
include:
47+
allow_failures:
48+
- go: 1.9.x
49+
- go: 1.10.x
3150

51+
deploy:
52+
- provider: script
53+
skip_cleanup: true
54+
script: curl -sL http://git.io/goreleaser | bash
55+
on:
56+
tags: true
57+
go: 1.11.x
58+
condition: $TRAVIS_OS_NAME = linux
59+

Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
FROM golang:1.11.1
22

3-
RUN curl https://raw.githubusercontent.com/golang/dep/v0.5.0/install.sh | sh
4-
53
RUN mkdir -p /go/src/github.com/clivern/beaver/
64

75
ADD . /go/src/github.com/clivern/beaver/
86

97
WORKDIR /go/src/github.com/clivern/beaver
108

11-
RUN dep ensure
12-
139
RUN go build -o beaver beaver.go
1410

1511
EXPOSE 8080

Gopkg.lock

Lines changed: 0 additions & 253 deletions
This file was deleted.

0 commit comments

Comments
 (0)