File tree Expand file tree Collapse file tree 3 files changed +22
-11
lines changed Expand file tree Collapse file tree 3 files changed +22
-11
lines changed Original file line number Diff line number Diff line change @@ -145,8 +145,6 @@ jobs:
145
145
defaults :
146
146
run :
147
147
shell : bash
148
- env :
149
- FPM_VERSION : " 1.11.0"
150
148
needs : [lint, test]
151
149
if : startsWith(github.ref, 'refs/tags/v')
152
150
steps :
@@ -156,10 +154,24 @@ jobs:
156
154
uses : actions/setup-go@v2
157
155
with :
158
156
go-version : 1.14.x
159
- - name : Install fpm
157
+ - name : Install package builders
160
158
run : |
161
- sudo apt-get update && sudo apt-get install -y ruby ruby-dev rubygems build-essential
162
- sudo gem install --no-document fpm -v $FPM_VERSION
159
+ pushd .
160
+ tmpdir=$(mktemp -d)
161
+ cd "$tmpdir"
162
+ go get github.com/Masterminds/glide
163
+ go get -d github.com/mh-cbon/go-bin-deb \
164
+ && (cd $GOPATH/src/github.com/mh-cbon/go-bin-deb \
165
+ && glide install \
166
+ && go install)
167
+ go get -d github.com/mh-cbon/go-bin-rpm \
168
+ && (cd $GOPATH/src/github.com/mh-cbon/go-bin-rpm \
169
+ && glide install \
170
+ && go install)
171
+ apt-get update -y
172
+ apt-get install -y fakeroot rpm
173
+ popd
174
+ rm -rf "$tmpdir"
163
175
- name : Build
164
176
run : |
165
177
go version
Original file line number Diff line number Diff line change @@ -40,10 +40,9 @@ package() {
40
40
echo " - Creating ${NAME} .${FMT} package..."
41
41
case $FMT in
42
42
deb|rpm)
43
- fpm --force --verbose --name=k6 --version=" $VERSION " \
44
- --vendor=k6 --license=AGPLv3 --url=" https://k6.io/" \
45
- --input-type=dir --output-type=" $FMT " \
46
- --package=" ${OUT_DIR} /${NAME} .${FMT} " " ${OUT_DIR} /${NAME} /k6=/usr/bin/"
43
+ # The go-bin-* tools expect the binary in /tmp/
44
+ [ ! -r /tmp/k6 ] && cp " dist/${NAME} /k6" /tmp/k6
45
+ " go-bin-${FMT} " generate --file " packaging/${FMT} .json" -a amd64 --version $VERSION -o " dist/k6-v${VERSION} -amd64.${FMT} "
47
46
;;
48
47
tgz)
49
48
tar -C " ${OUT_DIR} " -zcf " ${OUT_DIR} /${NAME} .tar.gz" " $NAME "
Original file line number Diff line number Diff line change 15
15
"copyrights" : [
16
16
{
17
17
"files" : " *" ,
18
- "copyright" : " 2018 Load Impact AB" ,
18
+ "copyright" : " 2020 Load Impact AB" ,
19
19
"license" : " AGPL-3.0" ,
20
20
"file" : " LICENSE"
21
21
}
22
22
]
23
- }
23
+ }
You can’t perform that action at this time.
0 commit comments