diff options
| author | Caleb Bassi <calebjbassi@gmail.com> | 2019-02-07 14:06:40 -0800 |
|---|---|---|
| committer | Caleb Bassi <calebjbassi@gmail.com> | 2019-02-07 14:06:40 -0800 |
| commit | f5595236ecd758a0ae36ff7026eef7acb8e529ea (patch) | |
| tree | cb404724f8f82b0cb13351fb3e4434a2e0699656 /ci | |
| parent | e2c26cd7ac56d6c108ac6143460ea59511bd569e (diff) | |
Readd Makefile
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/nfpm.yml | 15 | ||||
| -rwxr-xr-x | ci/script.sh | 15 |
2 files changed, 2 insertions, 28 deletions
diff --git a/ci/nfpm.yml b/ci/nfpm.yml deleted file mode 100644 index a15824a..0000000 --- a/ci/nfpm.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: "gotop" -arch: "amd64" -platform: "linux" -version: "v${VERSION}" -section: "default" -priority: "extra" -maintainer: "Caleb Bassi <calebjbassi@gmail.com>" -description: | - A terminal based graphical activity monitor inspired by gtop and vtop -vendor: "Caleb Bassi" -homepage: "https://github.com/cjbassi/gotop" -license: "GNU Affero General Public License v3.0" -bindir: "/usr/local/bin" -files: - /tmp/pkg/gotop: "/usr/local/bin/gotop" diff --git a/ci/script.sh b/ci/script.sh index 3872b25..142d0cf 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -23,19 +23,8 @@ fi tar -czf dist/${FILE}.tgz ${NAME} || ERROR=true if [[ ${GOOS} == "linux" && ${GOARCH} == "amd64" ]]; then - VERSION=$(go run main.go -v) # used by nfpm - docker run --rm \ - -v $PWD:/tmp/pkg \ - -e VERSION=${VERSION} \ - goreleaser/nfpm pkg \ - --config /tmp/pkg/ci/nfpm.yml \ - --target /tmp/pkg/dist/${FILE}.deb || ERROR=true - docker run --rm \ - -v $PWD:/tmp/pkg \ - -e VERSION=${VERSION} \ - goreleaser/nfpm pkg \ - --config /tmp/pkg/ci/nfpm.yml \ - --target /tmp/pkg/dist/${FILE}.rpm || ERROR=true + make all || ERROR=true + rm dist/gotop fi if [ ${ERROR} == "true" ]; then |