Skip to content

Commit 0227b7e

Browse files
umbynosumbynos
committed
apply suggestion from code review
1 parent 956ab37 commit 0227b7e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎DistTasks.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ tasks:
3232
docker run -v `pwd`/..:/home/build -w /home/build \
3333
-e CGO_ENABLED=1 \
3434
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
35-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
35+
--build-cmd "{{.BUILD_COMMAND}}" \
3636
-p "{{.BUILD_PLATFORM}}"
3737
3838
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.PLATFORM_DIR}}/LICENSE.txt
3939
4040
vars:
4141
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_386"
4242
HOST: "i686-w64-mingw32"
43-
BUILD_LIBUSB: >
43+
BUILD_COMMAND: >
4444
curl -L https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2 | tar xj &&
4545
cd libusb-1.0.26/ &&
4646
./configure --with-pic --disable-udev --enable-static --disable-shared --host={{.HOST}} &&
4747
make -j"$(nproc)" &&
4848
make install &&
4949
make distclean &&
5050
cd .. &&
51-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
51+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}
5252
BUILD_PLATFORM: "windows/386"
5353
CONTAINER_TAG: "{{.GO_VERSION}}-main"
5454
PACKAGE_PLATFORM: "Windows_32bit"
@@ -64,7 +64,7 @@ tasks:
6464
docker run -v `pwd`/..:/home/build -w /home/build \
6565
-e CGO_ENABLED=1 \
6666
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
67-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
67+
--build-cmd "{{.BUILD_COMMAND}}" \
6868
-p "{{.BUILD_PLATFORM}}"
6969
7070
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.PLATFORM_DIR}}/LICENSE.txt
@@ -80,7 +80,7 @@ tasks:
8080
make install &&
8181
make distclean &&
8282
cd .. &&
83-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
83+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}
8484
BUILD_PLATFORM: "windows/amd64"
8585
CONTAINER_TAG: "{{.GO_VERSION}}-main"
8686
PACKAGE_PLATFORM: "Windows_64bit"
@@ -96,7 +96,7 @@ tasks:
9696
docker run -v `pwd`/..:/home/build -w /home/build \
9797
-e CGO_ENABLED=1 \
9898
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
99-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
99+
--build-cmd "{{.BUILD_COMMAND}}" \
100100
-p "{{.BUILD_PLATFORM}}"
101101
102102
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -112,7 +112,7 @@ tasks:
112112
make install &&
113113
make distclean &&
114114
cd .. &&
115-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
115+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
116116
BUILD_PLATFORM: "linux/386"
117117
CONTAINER_TAG: "{{.GO_VERSION}}-main"
118118
PACKAGE_PLATFORM: "Linux_32bit"
@@ -128,7 +128,7 @@ tasks:
128128
docker run -v `pwd`/..:/home/build -w /home/build \
129129
-e CGO_ENABLED=1 \
130130
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
131-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
131+
--build-cmd "{{.BUILD_COMMAND}}" \
132132
-p "{{.BUILD_PLATFORM}}"
133133
134134
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -144,7 +144,7 @@ tasks:
144144
make install &&
145145
make distclean &&
146146
cd .. &&
147-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
147+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
148148
BUILD_PLATFORM: "linux/amd64"
149149
CONTAINER_TAG: "{{.GO_VERSION}}-main"
150150
PACKAGE_PLATFORM: "Linux_64bit"
@@ -160,7 +160,7 @@ tasks:
160160
docker run -v `pwd`/..:/home/build -w /home/build \
161161
-e CGO_ENABLED=1 \
162162
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
163-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
163+
--build-cmd "{{.BUILD_COMMAND}}" \
164164
-p "{{.BUILD_PLATFORM}}"
165165
166166
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -176,7 +176,7 @@ tasks:
176176
make install &&
177177
make distclean &&
178178
cd .. &&
179-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
179+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
180180
BUILD_PLATFORM: "linux/armv7"
181181
CONTAINER_TAG: "{{.GO_VERSION}}-armhf"
182182
PACKAGE_PLATFORM: "Linux_ARMv7"
@@ -192,7 +192,7 @@ tasks:
192192
docker run -v `pwd`/..:/home/build -w /home/build \
193193
-e CGO_ENABLED=1 \
194194
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
195-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
195+
--build-cmd "{{.BUILD_COMMAND}}" \
196196
-p "{{.BUILD_PLATFORM}}"
197197
198198
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -208,7 +208,7 @@ tasks:
208208
make install &&
209209
make distclean &&
210210
cd .. &&
211-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
211+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
212212
BUILD_PLATFORM: "linux/armv6"
213213
CONTAINER_TAG: "{{.GO_VERSION}}-armel-debian9"
214214
PACKAGE_PLATFORM: "Linux_ARMv6"
@@ -224,7 +224,7 @@ tasks:
224224
docker run -v `pwd`/..:/home/build -w /home/build \
225225
-e CGO_ENABLED=1 \
226226
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
227-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
227+
--build-cmd "{{.BUILD_COMMAND}}" \
228228
-p "{{.BUILD_PLATFORM}}"
229229
230230
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -240,7 +240,7 @@ tasks:
240240
make install &&
241241
make distclean &&
242242
cd .. &&
243-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
243+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
244244
BUILD_PLATFORM: "linux/arm64"
245245
CONTAINER_TAG: "{{.GO_VERSION}}-arm"
246246
PACKAGE_PLATFORM: "Linux_ARM64"
@@ -257,7 +257,7 @@ tasks:
257257
-e CGO_ENABLED=1 \
258258
-e OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 \
259259
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
260-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
260+
--build-cmd "{{.BUILD_COMMAND}}" \
261261
-p "{{.BUILD_PLATFORM}}"
262262
263263
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -273,7 +273,7 @@ tasks:
273273
make install &&
274274
make distclean &&
275275
cd .. &&
276-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
276+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
277277
BUILD_PLATFORM: "darwin/amd64"
278278
# We are experiencing the following error with macOS_64bit build:
279279
#
@@ -303,7 +303,7 @@ tasks:
303303
-e CGO_ENABLED=1 \
304304
-e OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 \
305305
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
306-
--build-cmd "{{.BUILD_LIBUSB}}{{.BUILD_COMMAND}}" \
306+
--build-cmd "{{.BUILD_COMMAND}}" \
307307
-p "{{.BUILD_PLATFORM}}"
308308
309309
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -319,7 +319,7 @@ tasks:
319319
make install &&
320320
make distclean &&
321321
cd .. &&
322-
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
322+
go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}
323323
BUILD_PLATFORM: "darwin/arm64"
324324
CONTAINER_TAG: "{{.GO_VERSION}}-darwin-arm64-debian10"
325325
PACKAGE_PLATFORM: "macOS_ARM64"

0 commit comments

Comments
 (0)