diff --git a/.travis.yml b/.travis.yml index 6de7014..395ee7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ # acceptance does not work with current default trusty dist: xenial -addons: - apt: - packages: - - rpm language: go go: '1.13.x' services: @@ -12,8 +8,6 @@ before_install: - sudo docker run --privileged linuxkit/binfmt:v0.7 install: - make setup -before_script: - - rpmbuild --version script: - make ci after_success: diff --git a/Makefile b/Makefile index 76472b2..fd5923a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TEST_OPTIONS?= export PATH := ./bin:$(PATH) export GO111MODULE := on -export GOPROXY := https://gocenter.io +export GOPROXY := https://proxy.golang.org,https://gocenter.io,direct # Install all the build and lint dependencies setup: diff --git a/README.md b/README.md index 86a2229..465c41a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ so I hacked this together and it works! * [x] provide packaging for the most common linux packaging systems (at very least deb and rpm) * [x] be distributed as a single binary * [x] reproducible results - * [x] depend on the fewer external things as possible (namely `rpmbuild`) + * [x] depend on the fewer external things as possible * [x] generate packages based on yaml files (maybe also json and toml?) * [x] be possible to use it as a lib in other go projects (namely [goreleaser][] itself) * [ ] support complex packages and power users diff --git a/go.mod b/go.mod index f55d041..eca34b1 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/davecgh/go-spew v1.1.1 // indirect - github.com/google/rpmpack v0.0.0-20191004000632-07246cf402fe + github.com/google/rpmpack v0.0.0-20191008200312-0a19814a44d4 github.com/imdario/mergo v0.3.8 github.com/kr/pretty v0.1.0 // indirect github.com/mattn/go-zglob v0.0.1 diff --git a/go.sum b/go.sum index 5d5e27e..970f7a1 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/rpmpack v0.0.0-20191004000632-07246cf402fe h1:465GSygXcdjtvc7bEe30+3KZ9yWLUNBo3C0Vp7yTbaw= -github.com/google/rpmpack v0.0.0-20191004000632-07246cf402fe/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= +github.com/google/rpmpack v0.0.0-20191008200312-0a19814a44d4 h1:fmYHpHYf8uqxPFxL6IDWFUgtmpTxkAnD+cZv2/Ef2I8= +github.com/google/rpmpack v0.0.0-20191008200312-0a19814a44d4/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= diff --git a/rpm/rpm.go b/rpm/rpm.go index c38e693..277ab15 100644 --- a/rpm/rpm.go +++ b/rpm/rpm.go @@ -1,4 +1,5 @@ -// Package rpm implements nfpm.Packager providing .rpm bindings through rpmbuild. +// Package rpm implements nfpm.Packager providing .rpm bindings using +// google/rpmpack. package rpm import (