From 5a83452c64df13d29df156511be2e8f1ef5af70b Mon Sep 17 00:00:00 2001 From: Christopher Young Date: Sat, 13 May 2017 11:01:52 -0400 Subject: [PATCH] Skip fancontrol build on CircleCI - no wiringPi equivalent on x86. #593. --- Makefile | 7 +++---- circle.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cf005a19..aca06444 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,15 @@ ifeq "$(CIRCLECI)" "true" BUILDINFO= + PLATFORMDEPENDENT= else BUILDINFO=-ldflags "-X main.stratuxVersion=`git describe --tags --abbrev=0` -X main.stratuxBuild=`git log -n 1 --pretty=%H`" $(if $(GOROOT),,$(error GOROOT is not set!)) + PLATFORMDEPENDENT=fancontrol endif all: - make xdump978 - make xdump1090 - make xgen_gdl90 - make fancontrol + make xdump978 xdump1090 xgen_gdl90 $(PLATFORMDEPENDENT) xgen_gdl90: go get -t -d -v ./main ./test ./godump978 ./uatparse diff --git a/circle.yml b/circle.yml index 68a31e65..925e7573 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: dependencies: pre: - - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; sudo apt-get install wiringpi; cd ~/; git clone https://github.com/jpoirier/librtlsdr; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.6.src.tar.gz; tar -zxvf go1.6.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env + - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd ~/; git clone https://github.com/jpoirier/librtlsdr; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.6.src.tar.gz; tar -zxvf go1.6.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env override: - cd .. ; rm -rf stratux ; git clone --recursive https://github.com/cyoung/stratux ; cd stratux ; git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*" ; git fetch origin ; BRANCH=`echo "$CIRCLE_BRANCH" | sed 's/pull\//pr\//g'` ; git checkout $BRANCH ; make