vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-07 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix up build for recent versions of Go

Browse Source 
Forbid broken goxc tasks.
This commit is contained in:
Andrey Smirnov
2016-11-28 16:37:47 +03:00
parent d008cabf07
commit d100033b46
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5 -1
View File
@@ -27,8 +27,12 @@ coverage*.out
*.pyc *.pyc
_vendor/ vendor/
xc-out/
root/
gen gen
man/aptly.1.html man/aptly.1.html
man/aptly.1.ronn man/aptly.1.ronn
.goxc.local.json
.goxc.json
+5 -3
View File
@@ -2,10 +2,12 @@
"AppName": "aptly", "AppName": "aptly",
"ArtifactsDest": "xc-out/", "ArtifactsDest": "xc-out/",
"TasksExclude": [ "TasksExclude": [
"rmbin" "rmbin",
"go-test",
"go-vet"
], ],
"TasksAppend": [ "TasksAppend": [
"bintray" "bintray"
], ],
"TaskSettings": { "TaskSettings": {
"deb": { "deb": {
@@ -33,6 +35,6 @@
}, },
"Arch": "386 amd64", "Arch": "386 amd64",
"Os": "linux darwin freebsd", "Os": "linux darwin freebsd",
"MainDirsExclude": "man,_vendor", "MainDirsExclude": "man,vendor",
"ConfigVersion": "0.9" "ConfigVersion": "0.9"
} }
.travis.yml
+1 -1
View File
@@ -3,8 +3,8 @@ sudo: false
language: go language: go
go: go:
- 1.5
- 1.6 - 1.6
- 1.7
- tip - tip
addons: addons:
Makefile
+2 -2
View File
@@ -1,7 +1,7 @@
GOVERSION=$(shell go version | awk '{print $$3;}') GOVERSION=$(shell go version | awk '{print $$3;}')
PACKAGES=context database deb files http query swift s3 utils PACKAGES=context database deb files http query swift s3 utils
ALL_PACKAGES=api aptly context cmd console database deb files http query swift s3 utils ALL_PACKAGES=api aptly context cmd console database deb files http query swift s3 utils
BINPATH=$(abspath ./_vendor/bin) BINPATH=$(abspath ./vendor/bin)
GOM_ENVIRONMENT=-test GOM_ENVIRONMENT=-test
PYTHON?=python PYTHON?=python
@@ -65,7 +65,7 @@ src-package:
cd aptly-$(VERSION)/src/github.com/smira/ && git clone https://github.com/smira/aptly && cd aptly && git checkout v$(VERSION) cd aptly-$(VERSION)/src/github.com/smira/ && git clone https://github.com/smira/aptly && cd aptly && git checkout v$(VERSION)
cd aptly-$(VERSION)/src/github.com/smira/aptly && gom -production install cd aptly-$(VERSION)/src/github.com/smira/aptly && gom -production install
cd aptly-$(VERSION)/src/github.com/smira/aptly && find . \( -name .git -o -name .bzr -o -name .hg \) -print | xargs rm -rf cd aptly-$(VERSION)/src/github.com/smira/aptly && find . \( -name .git -o -name .bzr -o -name .hg \) -print | xargs rm -rf
rm -rf aptly-$(VERSION)/src/github.com/smira/aptly/_vendor/{pkg,bin} rm -rf aptly-$(VERSION)/src/github.com/smira/aptly/vendor/{pkg,bin}
mkdir -p aptly-$(VERSION)/bash_completion.d mkdir -p aptly-$(VERSION)/bash_completion.d
(cd aptly-$(VERSION)/bash_completion.d && wget https://raw.github.com/aptly-dev/aptly-bash-completion/$(VERSION)/aptly) (cd aptly-$(VERSION)/bash_completion.d && wget https://raw.github.com/aptly-dev/aptly-bash-completion/$(VERSION)/aptly)
tar cyf aptly-$(VERSION)-src.tar.bz2 aptly-$(VERSION) tar cyf aptly-$(VERSION)-src.tar.bz2 aptly-$(VERSION)
README.rst
+1 -1
View File
@@ -64,7 +64,7 @@ If you would like to use nightly builds (unstable), please use following reposit
Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_. Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_.
If you have Go environment set up, you can build aptly from source by running (go 1.4+ required):: If you have Go environment set up, you can build aptly from source by running (go 1.6+ required)::
go get -u github.com/mattn/gom go get -u github.com/mattn/gom
mkdir -p $GOPATH/src/github.com/smira/aptly mkdir -p $GOPATH/src/github.com/smira/aptly