Skip to content

Commit 463b627

Browse files
authored
Restored the correct package format for the Arduino package_index.json (#78)
The archive must contain a folder with all the files inside it.
1 parent 7c8454b commit 463b627

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

DistTasks.yml

+27-9
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ tasks:
4141
dir: "{{.DIST_DIR}}"
4242
cmds:
4343
- |
44+
mkdir {{.PLATFORM_DIR}}
45+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
4446
docker run -v `pwd`/..:/home/build -w /home/build \
4547
-e CGO_ENABLED=0 \
4648
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
4749
--build-cmd "{{.BUILD_COMMAND}}" \
4850
-p "{{.BUILD_PLATFORM}}"
4951
50-
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
52+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.PLATFORM_DIR}}/LICENSE.txt
5153
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
5254
5355
vars:
@@ -63,13 +65,15 @@ tasks:
6365
dir: "{{.DIST_DIR}}"
6466
cmds:
6567
- |
68+
mkdir {{.PLATFORM_DIR}}
69+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
6670
docker run -v `pwd`/..:/home/build -w /home/build \
6771
-e CGO_ENABLED=0 \
6872
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
6973
--build-cmd "{{.BUILD_COMMAND}}" \
7074
-p "{{.BUILD_PLATFORM}}"
7175
72-
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe ../LICENSE.txt -j
76+
zip {{.PACKAGE_NAME}} {{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.PLATFORM_DIR}}/LICENSE.txt
7377
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
7478
7579
vars:
@@ -85,13 +89,15 @@ tasks:
8589
dir: "{{.DIST_DIR}}"
8690
cmds:
8791
- |
92+
mkdir {{.PLATFORM_DIR}}
93+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
8894
docker run -v `pwd`/..:/home/build -w /home/build \
8995
-e CGO_ENABLED=0 \
9096
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
9197
--build-cmd "{{.BUILD_COMMAND}}" \
9298
-p "{{.BUILD_PLATFORM}}"
9399
94-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
100+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
95101
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
96102
97103
vars:
@@ -107,13 +113,15 @@ tasks:
107113
dir: "{{.DIST_DIR}}"
108114
cmds:
109115
- |
116+
mkdir {{.PLATFORM_DIR}}
117+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
110118
docker run -v `pwd`/..:/home/build -w /home/build \
111119
-e CGO_ENABLED=0 \
112120
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
113121
--build-cmd "{{.BUILD_COMMAND}}" \
114122
-p "{{.BUILD_PLATFORM}}"
115123
116-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
124+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
117125
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
118126
119127
vars:
@@ -129,13 +137,15 @@ tasks:
129137
dir: "{{.DIST_DIR}}"
130138
cmds:
131139
- |
140+
mkdir {{.PLATFORM_DIR}}
141+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
132142
docker run -v `pwd`/..:/home/build -w /home/build \
133143
-e CGO_ENABLED=0 \
134144
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
135145
--build-cmd "{{.BUILD_COMMAND}}" \
136146
-p "{{.BUILD_PLATFORM}}"
137147
138-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
148+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
139149
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
140150
141151
vars:
@@ -151,13 +161,15 @@ tasks:
151161
dir: "{{.DIST_DIR}}"
152162
cmds:
153163
- |
164+
mkdir {{.PLATFORM_DIR}}
165+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
154166
docker run -v `pwd`/..:/home/build -w /home/build \
155167
-e CGO_ENABLED=0 \
156168
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
157169
--build-cmd "{{.BUILD_COMMAND}}" \
158170
-p "{{.BUILD_PLATFORM}}"
159171
160-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
172+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
161173
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
162174
163175
vars:
@@ -205,13 +217,15 @@ tasks:
205217
dir: "{{.DIST_DIR}}"
206218
cmds:
207219
- |
220+
mkdir {{.PLATFORM_DIR}}
221+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
208222
docker run -v `pwd`/..:/home/build -w /home/build \
209223
-e CGO_ENABLED=0 \
210224
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
211225
--build-cmd "{{.BUILD_COMMAND}}" \
212226
-p "{{.BUILD_PLATFORM}}"
213227
214-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
228+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
215229
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
216230
217231
vars:
@@ -228,13 +242,15 @@ tasks:
228242
cmds:
229243
# "git config safe.directory" is required until this is fixed https://github.com/elastic/golang-crossbuild/issues/232
230244
- |
245+
mkdir {{.PLATFORM_DIR}}
246+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
231247
docker run -v `pwd`/..:/home/build -w /home/build \
232248
-e CGO_ENABLED=0 \
233249
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
234250
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
235251
-p "{{.BUILD_PLATFORM}}"
236252
237-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
253+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
238254
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
239255
240256
vars:
@@ -264,13 +280,15 @@ tasks:
264280
cmds:
265281
# "git config safe.directory" is required until this is fixed https://github.com/elastic/golang-crossbuild/issues/232
266282
- |
283+
mkdir {{.PLATFORM_DIR}}
284+
cp ../LICENSE.txt {{.PLATFORM_DIR}}/
267285
docker run -v `pwd`/..:/home/build -w /home/build \
268286
-e CGO_ENABLED=0 \
269287
{{.CONTAINER}}:{{.CONTAINER_TAG}} \
270288
--build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
271289
-p "{{.BUILD_PLATFORM}}"
272290
273-
tar cz -C {{.PLATFORM_DIR}} {{.PROJECT_NAME}} -C ../.. LICENSE.txt -f {{.PACKAGE_NAME}}
291+
tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
274292
sha256sum {{.PACKAGE_NAME}} >> {{.CHECKSUM_FILE}}
275293
276294
vars:

0 commit comments

Comments
 (0)