Browse Source

chore(ci): hopefully fix travis setup

Mustafa Arici 8 years ago
parent
commit
9029e2bc39
3 changed files with 6 additions and 5 deletions
  1. 1 2
      .travis.yml
  2. 2 2
      Makefile
  3. 3 1
      build.sh

+ 1 - 2
.travis.yml

@@ -30,7 +30,6 @@ script:
   - make docker-build
 
 deploy:
-  # Deploy packages to PackageCloud
   provider: packagecloud
   username: ${PACKAGECLOUD_USER}
   repository: ${PACKAGECLOUD_REPO}
@@ -40,4 +39,4 @@ deploy:
   skip_cleanup: true
   on:
     tag: true
-    #branch: master
+    condition: -n $TRAVIS_TAG  && $TRAVIS_TAG == "v*"

+ 2 - 2
Makefile

@@ -1,4 +1,4 @@
 .PHONY: build
 docker-build:
-	docker run --rm -i -t -v `pwd`:/fs/src/github.com/cad/ovpm -w /fs/src/github.com/cad/ovpm fedora ./build.sh
-	#docker run --rm -i -t -v `pwd`:/fs/src/github.com/cad/ovpm -w /fs/src/github.com/cad/ovpm fedora /bin/bash
+	docker run --rm -i -t -e TRAVIS_BUILD_NUMBER=$(TRAVIS_BUILD_NUMBER) -e TRAVIS_TAG=$(TRAVIS_TAG) -v `pwd`:/fs/src/github.com/cad/ovpm -w /fs/src/github.com/cad/ovpm fedora ./build.sh
+	#docker run --rm -i -t -e TRAVIS_BUILD_NUMBER=$(TRAVIS_BUILD_NUMBER) -e TRAVIS_TAG=$(TRAVIS_TAG) -v `pwd`:/fs/src/github.com/cad/ovpm -w /fs/src/github.com/cad/ovpm fedora /bin/bash

+ 3 - 1
build.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -ex
 
+echo "travis build no: $TRAVIS_BUILD_NUMBER"
+echo "travis build no: $TRAVIS_TAG"
 # deps
 rpm --import https://mirror.go-repo.io/fedora/RPM-GPG-KEY-GO-REPO
 curl -s https://mirror.go-repo.io/fedora/go-repo.repo | tee /etc/yum.repos.d/go-repo.repo
@@ -29,4 +31,4 @@ GOOS=linux  go build  -o $DIR/build/usr/bin/ovpm   ./cmd/ovpm
 cp $DIR/contrib/systemd/ovpmd.service $DIR/build/$UNITDIR
 
 #package
-fpm -s dir -t rpm -n ovpm --version `git name-rev --tags --name-only $(git rev-parse HEAD) | cut -d 'v' -f 2` --iteration 1 --depends openvpn --description "OVPM makes all aspects of OpenVPN server administration a breeze." --after-install $DIR/contrib/afterinstall.sh --before-remove $DIR/contrib/beforeremove.sh -p $DIR/rpm -C $DIR/build .
+fpm -s dir -t rpm -n ovpm --version `git name-rev --tags --name-only $(git rev-parse HEAD) | cut -d 'v' -f 2` --iteration $TRAVIS_BUILD_NUMBER --depends openvpn --description "OVPM makes all aspects of OpenVPN server administration a breeze." --after-install $DIR/contrib/afterinstall.sh --before-remove $DIR/contrib/beforeremove.sh -p $DIR/rpm -C $DIR/build .