vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make: revert switch to 'go install'

Browse source 
go install acts incredibly weirdly and rarely does what you want, not to
mention that it's just bad for distribution build setups. Switch back to
go build, which works properly and doesn't have half as many issues.

Fixes: 6c9628cdb1 ("Build and install from GOPATH")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2017-01-25 00:07:05 +11:00
parent 6d76ea2fa1
commit 0d7147ff5c
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/helpers.bash
View file

@ -10,9 +10,9 @@ TESTDATA="${INTEGRATION_ROOT}/testdata"
OCID_ROOT=${OCID_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)}
# Path of the ocid binary.
OCID_BINARY=${OCID_BINARY:-${GOPATH}/bin/ocid}
OCID_BINARY=${OCID_BINARY:-${OCID_ROOT}/cri-o/ocid}
# Path of the ocic binary.
OCIC_BINARY=${OCIC_BINARY:-${GOPATH}/bin/ocic}
OCIC_BINARY=${OCIC_BINARY:-${OCID_ROOT}/cri-o/ocic}
# Path of the conmon binary.
CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/cri-o/conmon/conmon}
# Path of the pause binary.