Skip to content

Commit e38c327

Browse files
committed
Fix issues with the linux package builds and the README
This is just a collection of short-term fixes: - pin the latest .msi package in the README, instead of using a specific version - use `go get -d` for the go-bin-deb and go-bin-rpm packages, to only download the source (without building them) before we use glide to get their precise dependencies - inject the new full version information in the build process As mentioned in #1247 (comment), we should build and test the linux packages regularly, so we can fix them if something breaks...
1 parent aeec9a7 commit e38c327

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ jobs:
123123
export PATH=$GOPATH/bin:$PATH
124124
125125
go get github.com/Masterminds/glide
126-
go get github.com/mh-cbon/go-bin-deb \
126+
go get -d github.com/mh-cbon/go-bin-deb \
127127
&& cd $GOPATH/src/github.com/mh-cbon/go-bin-deb \
128128
&& glide install \
129129
&& go install
130130
131-
go get github.com/mh-cbon/go-bin-rpm \
132-
&& cd $GOPATHsrc/github.com/mh-cbon/go-bin-rpm \
131+
go get -d github.com/mh-cbon/go-bin-rpm \
132+
&& cd $GOPATH/src/github.com/mh-cbon/go-bin-rpm \
133133
&& glide install \
134134
&& go install
135135
@@ -139,7 +139,7 @@ jobs:
139139
cd $GOPATH/src/github.com/loadimpact/k6
140140
141141
echo "Building k6..."
142-
CGO_ENABLED=0 GOARCH=$ARCH go build -a -trimpath -ldflags '-s -w' -o /tmp/k6
142+
CGO_ENABLED=0 GOARCH=amd64 go build -a -trimpath -ldflags "-s -w -X github.com/loadimpact/k6/lib/consts.VersionDetails=$(date -u +"%FT%T%z")/$(git describe --always --long --dirty)" -o /tmp/k6
143143
echo "Done!"
144144
145145
VERSION=${CIRCLE_TAG:1} ./packaging/gen-packages.sh

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ brew install k6
6666

6767
### Windows
6868

69-
You can manually download and install the [official `.msi` installation package](https://dl.bintray.com/loadimpact/windows/k6-v0.25.1-amd64.msi) or, if you use the [chocolatey package manager](https://chocolatey.org/), follow [these instructions](https://bintray.com/repo/buildSettings?repoPath=%2Floadimpact%2Fchoco) to set up the k6 repository.
69+
You can manually download and install the [official `.msi` installation package](https://dl.bintray.com/loadimpact/windows/k6-latest-amd64.msi) or, if you use the [chocolatey package manager](https://chocolatey.org/), follow [these instructions](https://bintray.com/repo/buildSettings?repoPath=%2Floadimpact%2Fchoco) to set up the k6 repository.
7070

7171
### Linux
7272

0 commit comments

Comments
 (0)