Skip to content

Commit df76715

Browse files
cmagliecmaglie
authored
Fixed distribution archive format. (#82)
1 parent e909b01 commit df76715

File tree

1 file changed

+30
-64
lines changed

1 file changed

+30
-64
lines changed

‎DistTasks.yml‎

Lines changed: 30 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,16 @@ tasks:
2828
dir: "{{.DIST_DIR}}"
2929
cmds:
3030
- |
31+
mkdir -p {{.PLATFORM_DIR}}
32+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
3133
docker run \
3234
-v `pwd`/..:/home/build \
3335
-w /home/build \
3436
-e CGO_ENABLED={{.CGO_ENABLED}} \
3537
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
3638
--build-cmd "{{.BUILD_COMMAND}}" \
3739
-p "{{.BUILD_PLATFORM}}"
38-
39-
zip \
40-
{{.PACKAGE_NAME}} \
41-
{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt \
42-
-j
40+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}} -r
4341
4442
vars:
4543
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_386"
@@ -54,18 +52,16 @@ tasks:
5452
dir: "{{.DIST_DIR}}"
5553
cmds:
5654
- |
55+
mkdir -p {{.PLATFORM_DIR}}
56+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
5757
docker run \
5858
-v `pwd`/..:/home/build \
5959
-w /home/build \
6060
-e CGO_ENABLED={{.CGO_ENABLED}} \
6161
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
6262
--build-cmd "{{.BUILD_COMMAND}}" \
6363
-p "{{.BUILD_PLATFORM}}"
64-
65-
zip \
66-
{{.PACKAGE_NAME}} \
67-
{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt \
68-
-j
64+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}} -r
6965
7066
vars:
7167
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_amd64"
@@ -80,18 +76,16 @@ tasks:
8076
dir: "{{.DIST_DIR}}"
8177
cmds:
8278
- |
79+
mkdir -p {{.PLATFORM_DIR}}
80+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
8381
docker run \
8482
-v `pwd`/..:/home/build \
8583
-w /home/build \
8684
-e CGO_ENABLED={{.CGO_ENABLED}} \
8785
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
8886
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
8987
-p "{{.BUILD_PLATFORM}}"
90-
91-
zip \
92-
{{.PACKAGE_NAME}} \
93-
{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt \
94-
-j
88+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}} -r
9589
9690
vars:
9791
PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_arm64"
@@ -106,20 +100,16 @@ tasks:
106100
dir: "{{.DIST_DIR}}"
107101
cmds:
108102
- |
103+
mkdir -p {{.PLATFORM_DIR}}
104+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
109105
docker run \
110106
-v `pwd`/..:/home/build \
111107
-w /home/build \
112108
-e CGO_ENABLED={{.CGO_ENABLED}} \
113109
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
114110
--build-cmd "{{.BUILD_COMMAND}}" \
115111
-p "{{.BUILD_PLATFORM}}"
116-
117-
tar cz \
118-
-C {{.PLATFORM_DIR}} \
119-
{{.PROJECT_NAME}} \
120-
-C ../.. \
121-
LICENSE.txt \
122-
-f {{.PACKAGE_NAME}}
112+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
123113
124114
vars:
125115
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_amd32"
@@ -134,20 +124,16 @@ tasks:
134124
dir: "{{.DIST_DIR}}"
135125
cmds:
136126
- |
127+
mkdir -p {{.PLATFORM_DIR}}
128+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
137129
docker run \
138130
-v `pwd`/..:/home/build \
139131
-w /home/build \
140132
-e CGO_ENABLED={{.CGO_ENABLED}} \
141133
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
142134
--build-cmd "{{.BUILD_COMMAND}}" \
143135
-p "{{.BUILD_PLATFORM}}"
144-
145-
tar cz \
146-
-C {{.PLATFORM_DIR}} \
147-
{{.PROJECT_NAME}} \
148-
-C ../.. \
149-
LICENSE.txt \
150-
-f {{.PACKAGE_NAME}}
136+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
151137
152138
vars:
153139
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_amd64"
@@ -162,20 +148,16 @@ tasks:
162148
dir: "{{.DIST_DIR}}"
163149
cmds:
164150
- |
151+
mkdir -p {{.PLATFORM_DIR}}
152+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
165153
docker run \
166154
-v `pwd`/..:/home/build \
167155
-w /home/build \
168156
-e CGO_ENABLED={{.CGO_ENABLED}} \
169157
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
170158
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
171159
-p "{{.BUILD_PLATFORM}}"
172-
173-
tar cz \
174-
-C {{.PLATFORM_DIR}} \
175-
{{.PROJECT_NAME}} \
176-
-C ../.. \
177-
LICENSE.txt \
178-
-f {{.PACKAGE_NAME}}
160+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
179161
180162
vars:
181163
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_7"
@@ -190,20 +172,16 @@ tasks:
190172
dir: "{{.DIST_DIR}}"
191173
cmds:
192174
- |
175+
mkdir -p {{.PLATFORM_DIR}}
176+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
193177
docker run \
194178
-v `pwd`/..:/home/build \
195179
-w /home/build \
196180
-e CGO_ENABLED={{.CGO_ENABLED}} \
197181
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
198182
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
199183
-p "{{.BUILD_PLATFORM}}"
200-
201-
tar cz \
202-
-C {{.PLATFORM_DIR}} \
203-
{{.PROJECT_NAME}} \
204-
-C ../.. \
205-
LICENSE.txt \
206-
-f {{.PACKAGE_NAME}}
184+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
207185
208186
vars:
209187
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
@@ -218,20 +196,16 @@ tasks:
218196
dir: "{{.DIST_DIR}}"
219197
cmds:
220198
- |
199+
mkdir -p {{.PLATFORM_DIR}}
200+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
221201
docker run \
222202
-v `pwd`/..:/home/build \
223203
-w /home/build \
224204
-e CGO_ENABLED={{.CGO_ENABLED}} \
225205
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
226206
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
227207
-p "{{.BUILD_PLATFORM}}"
228-
229-
tar cz \
230-
-C {{.PLATFORM_DIR}} \
231-
{{.PROJECT_NAME}} \
232-
-C ../.. \
233-
LICENSE.txt \
234-
-f {{.PACKAGE_NAME}}
208+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
235209
236210
vars:
237211
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_64"
@@ -246,20 +220,16 @@ tasks:
246220
dir: "{{.DIST_DIR}}"
247221
cmds:
248222
- |
223+
mkdir -p {{.PLATFORM_DIR}}
224+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
249225
docker run \
250226
-v `pwd`/..:/home/build \
251227
-w /home/build \
252228
-e CGO_ENABLED={{.CGO_ENABLED}} \
253229
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
254230
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
255231
-p "{{.BUILD_PLATFORM}}"
256-
257-
tar cz \
258-
-C {{.PLATFORM_DIR}} \
259-
{{.PROJECT_NAME}} \
260-
-C ../.. \
261-
LICENSE.txt \
262-
-f {{.PACKAGE_NAME}}
232+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
263233
264234
vars:
265235
PLATFORM_DIR: "{{.PROJECT_NAME}}_osx_darwin_amd64"
@@ -287,20 +257,16 @@ tasks:
287257
dir: "{{.DIST_DIR}}"
288258
cmds:
289259
- |
260+
mkdir -p {{.PLATFORM_DIR}}
261+
cp ../LICENSE.txt {{.PLATFORM_DIR}}
290262
docker run \
291263
-v `pwd`/..:/home/build \
292264
-w /home/build \
293265
-e CGO_ENABLED={{.CGO_ENABLED}} \
294266
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
295267
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
296268
-p "{{.BUILD_PLATFORM}}"
297-
298-
tar cz \
299-
-C {{.PLATFORM_DIR}} \
300-
{{.PROJECT_NAME}} \
301-
-C ../.. \
302-
LICENSE.txt \
303-
-f {{.PACKAGE_NAME}}
269+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
304270
305271
vars:
306272
PLATFORM_DIR: "{{.PROJECT_NAME}}_osx_darwin_arm64"

0 commit comments

Comments
 (0)