Skip to content

Commit 9514fe7

Browse files
authored
Merge pull request #27 from arduino/umbynos/enhance_release_files
place the parent dir in archive, to have compatibility with the cli
2 parents 2010259 + d902c5b commit 9514fe7

File tree

1 file changed

+25
-9
lines changed

1 file changed

+25
-9
lines changed

Diff for: DistTasks.yml

+25-9
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ tasks:
4040
dir: "{{.DIST_DIR}}"
4141
cmds:
4242
- |
43+
mkdir {{.PLATFORM_DIR}}
44+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
4345
docker run -v `pwd`/..:/home/build -w /home/build \
4446
-e CGO_ENABLED=1 \
4547
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
4648
--build-cmd "{{.BUILD_COMMAND}}" \
4749
-p "{{.BUILD_PLATFORM}}"
4850
49-
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
51+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.PLATFORM_DIR}}/LICENSE.txt
5052
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
5153
5254
vars:
@@ -62,13 +64,15 @@ tasks:
6264
dir: "{{.DIST_DIR}}"
6365
cmds:
6466
- |
67+
mkdir {{.PLATFORM_DIR}}
68+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
6569
docker run -v `pwd`/..:/home/build -w /home/build \
6670
-e CGO_ENABLED=1 \
6771
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
6872
--build-cmd "{{.BUILD_COMMAND}}" \
6973
-p "{{.BUILD_PLATFORM}}"
7074
71-
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
75+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.PLATFORM_DIR}}/LICENSE.txt
7276
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
7377
7478
vars:
@@ -84,13 +88,15 @@ tasks:
8488
dir: "{{.DIST_DIR}}"
8589
cmds:
8690
- |
91+
mkdir {{.PLATFORM_DIR}}
92+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
8793
docker run -v `pwd`/..:/home/build -w /home/build \
8894
-e CGO_ENABLED=1 \
8995
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
9096
--build-cmd "{{.BUILD_COMMAND}}" \
9197
-p "{{.BUILD_PLATFORM}}"
9298
93-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
99+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
94100
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
95101
96102
vars:
@@ -106,13 +112,15 @@ tasks:
106112
dir: "{{.DIST_DIR}}"
107113
cmds:
108114
- |
115+
mkdir {{.PLATFORM_DIR}}
116+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
109117
docker run -v `pwd`/..:/home/build -w /home/build \
110118
-e CGO_ENABLED=1 \
111119
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
112120
--build-cmd "{{.BUILD_COMMAND}}" \
113121
-p "{{.BUILD_PLATFORM}}"
114122
115-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
123+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
116124
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
117125
118126
vars:
@@ -128,13 +136,15 @@ tasks:
128136
dir: "{{.DIST_DIR}}"
129137
cmds:
130138
- |
139+
mkdir {{.PLATFORM_DIR}}
140+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
131141
docker run -v `pwd`/..:/home/build -w /home/build \
132142
-e CGO_ENABLED=1 \
133143
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
134144
--build-cmd "{{.BUILD_COMMAND}}" \
135145
-p "{{.BUILD_PLATFORM}}"
136146
137-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
147+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
138148
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
139149
140150
vars:
@@ -150,13 +160,15 @@ tasks:
150160
dir: "{{.DIST_DIR}}"
151161
cmds:
152162
- |
163+
mkdir {{.PLATFORM_DIR}}
164+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
153165
docker run -v `pwd`/..:/home/build -w /home/build \
154166
-e CGO_ENABLED=1 \
155167
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
156168
--build-cmd "{{.BUILD_COMMAND}}" \
157169
-p "{{.BUILD_PLATFORM}}"
158170
159-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
171+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
160172
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
161173
162174
vars:
@@ -200,17 +212,19 @@ tasks:
200212
dir: "{{.DIST_DIR}}"
201213
cmds:
202214
- |
215+
mkdir {{.PLATFORM_DIR}}
216+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
203217
docker run -v `pwd`/..:/home/build -w /home/build \
204218
-e CGO_ENABLED=1 \
205219
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
206220
--build-cmd "{{.BUILD_COMMAND}}" \
207221
-p "{{.BUILD_PLATFORM}}"
208222
209-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
223+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
210224
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
211225
212226
vars:
213-
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
227+
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_64"
214228
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
215229
BUILD_PLATFORM: "linux/arm64"
216230
CONTAINER_TAG: "{{.GO_VERSION}}-arm"
@@ -222,13 +236,15 @@ tasks:
222236
dir: "{{.DIST_DIR}}"
223237
cmds:
224238
- |
239+
mkdir {{.PLATFORM_DIR}}
240+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
225241
docker run -v `pwd`/..:/home/build -w /home/build \
226242
-e CGO_ENABLED=1 \
227243
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
228244
--build-cmd "{{.BUILD_COMMAND}}" \
229245
-p "{{.BUILD_PLATFORM}}"
230246
231-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
247+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
232248
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
233249
234250
vars:

0 commit comments

Comments
 (0)