Skip to content

Commit

Permalink
Merge pull request #44 from Clivern/feature/go-modules
Browse files Browse the repository at this point in the history
Switch from dep to go modules
  • Loading branch information
Clivern authored Jan 9, 2019
2 parents 26b6900 + f3dfb32 commit 6b96fb7
Show file tree
Hide file tree
Showing 26 changed files with 167 additions and 399 deletions.
48 changes: 13 additions & 35 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,20 @@
# goreleaser release --skip-publish --snapshot
build:
goos:
- linux
- darwin
- windows
goarch:
- 386
- amd64
- arm
- arm64
ignore:
- goos: darwin
goarch: 386
builds:
- env:
- CGO_ENABLED=0
archive:
replacements:
darwin: Darwin
linux: Linux
windows: Windows
386: i386
amd64: x86_64
format_overrides:
- goos: windows
format: zip
brew:
github:
owner: clivern
name: beaver
folder: Formula
homepage: https://github.com/clivern/beaver
description: A Real Time Messaging Server
dependencies:
- git
nfpm:
homepage: https://github.com/clivern/beaver
description: A Real Time Messaging Server
maintainer: A.F <[email protected]>
vendor: Beaver
formats:
- deb
dependencies:
- git
checksum:
name_template: 'checksums.txt'
snapshot:
name_template: "{{ .Tag }}-next"
changelog:
sort: asc
filters:
exclude:
- '^docs:'
- '^test:'
32 changes: 30 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
language: go

# needed for the nfpm pipe
addons:
apt:
packages:
- rpm

services:
- redis-server

Expand All @@ -9,6 +15,9 @@ go:
- 1.11.x
- master

env:
- GO111MODULE=on

install: true

# Fix this by renaming the directory before testing.
Expand All @@ -23,9 +32,28 @@ script:
- cd clivern/beaver
- mv config.travis.yml config.test.yml
# Config & execute ci tasks
- make install_dep
- make install_revive
- make ensure_dep
- cp config.yml config.dist.yml
- make ci
# Workaround to clear any package used for testing only
- git status
- git diff > diff.log
- cat diff.log
- git clean -fd
- git reset --hard

matrix:
include:
allow_failures:
- go: 1.9.x
- go: 1.10.x

deploy:
- provider: script
skip_cleanup: true
script: curl -sL http://git.io/goreleaser | bash
on:
tags: true
go: 1.11.x
condition: $TRAVIS_OS_NAME = linux

4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
FROM golang:1.11.1

RUN curl https://raw.githubusercontent.com/golang/dep/v0.5.0/install.sh | sh

RUN mkdir -p /go/src/github.com/clivern/beaver/

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

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

RUN dep ensure

RUN go build -o beaver beaver.go

EXPOSE 8080
Expand Down
253 changes: 0 additions & 253 deletions Gopkg.lock

This file was deleted.

Loading

0 comments on commit 6b96fb7

Please sign in to comment.