@@ -349,23 +349,17 @@ jobs:
349
349
arch : [amd64]
350
350
include :
351
351
- os : ubuntu-20.04
352
- install-builder-name : linux
353
- executable-path : artifacts/linux-amd64/
352
+ platform-name : linux
354
353
installer-extension : .run
355
- artifact-name : arduino-create-agent-ubuntu-20.04-amd64
356
354
- os : windows-2019
357
355
arch : 386
358
- install-builder-name : windows
359
- executable-path : artifacts/windows/
356
+ platform-name : windows
360
357
extension : .exe
361
358
installer-extension : .exe
362
- artifact-name : arduino-create-agent-windows-2019-386
363
359
- os : windows-2019
364
- install-builder-name : windows
365
- executable-path : artifacts/windows/
360
+ platform-name : windows
366
361
extension : .exe
367
362
installer-extension : .exe
368
- artifact-name : arduino-create-agent-windows-2019-amd64
369
363
370
364
container :
371
365
image : floydpink/ubuntu-install-builder:22.10.0
@@ -380,19 +374,19 @@ jobs:
380
374
- name : Download artifact
381
375
uses : actions/download-artifact@v3
382
376
with :
383
- name : ${{ matrix.artifact-name }}
384
- path : ${{ matrix.executable-path }} # path expected by installbuilder
377
+ name : ${{ env.PROJECT_NAME }}-${{ matrix.os }}-${{ matrix.arch }}
378
+ path : artifacts/ ${{ matrix.platform-name }}/ # path expected by installbuilder
385
379
386
380
# zip artifacts do not mantain executable permission
387
381
- name : Make executable
388
- run : chmod -v +x ${{ matrix.executable-path }}${{ env.PROJECT_NAME }}*
382
+ run : chmod -v +x artifacts/ ${{ matrix.platform-name }}/ ${{ env.PROJECT_NAME }}*
389
383
if : matrix.os == 'ubuntu-20.04'
390
384
391
385
- name : Rename executable to Arduino_Create_Agent
392
- run : mv -v ${{ matrix.executable-path }}${{ env.PROJECT_NAME }}${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Agent${{ matrix.extension }}
386
+ run : mv -v artifacts/ ${{ matrix.platform-name }}/ ${{ env.PROJECT_NAME }}${{ matrix.extension }} artifacts/ ${{ matrix.platform-name }}/ Arduino_Create_Agent${{ matrix.extension }}
393
387
394
388
- name : Rename executable to Arduino_Create_Agent_cli
395
- run : mv -v ${{ matrix.executable-path }}${{ env.PROJECT_NAME }}_cli${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Agent_cli${{ matrix.extension }}
389
+ run : mv -v artifacts/ ${{ matrix.platform-name }}/ ${{ env.PROJECT_NAME }}_cli${{ matrix.extension }} artifacts/ ${{ matrix.platform-name }}/ Arduino_Create_Agent_cli${{ matrix.extension }}
396
390
if : matrix.os == 'ubuntu-20.04'
397
391
398
392
- name : Save InstallBuilder license to file
@@ -405,16 +399,16 @@ jobs:
405
399
# installbuilder reads the env vars with certs paths and use it to sign the installer.
406
400
- name : Launch Bitrock installbuilder
407
401
run : |
408
- ${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder -name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} architecture=${{ matrix.arch }}
402
+ ${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.platform -name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} architecture=${{ matrix.arch }}
409
403
410
404
- name : Generate archive
411
- run : tar -czvf ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder- name }}-${{ matrix.arch }}-installer.tar.gz ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder -name }}-${{ matrix.arch }}-installer${{matrix.installer-extension}}
405
+ run : tar -czvf ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.platform- name }}-${{ matrix.arch }}-installer.tar.gz ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.platform -name }}-${{ matrix.arch }}-installer${{matrix.installer-extension}}
412
406
if : matrix.os == 'ubuntu-20.04'
413
407
414
408
- name : Upload artifacts
415
409
uses : actions/upload-artifact@v3
416
410
with :
417
- name : ArduinoCreateAgent-${{ matrix.install-builder -name }}-${{ matrix.arch }}
411
+ name : ArduinoCreateAgent-${{ matrix.platform -name }}-${{ matrix.arch }}
418
412
path : ArduinoCreateAgent*
419
413
if-no-files-found : error
420
414
0 commit comments