Skip to content

Commit 72316b6

Browse files
committed
remove executable-path and artifact-name vars, they are redundant
1 parent 858a858 commit 72316b6

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

.github/workflows/release.yml

+11-17
Original file line numberDiff line numberDiff line change
@@ -349,23 +349,17 @@ jobs:
349349
arch: [amd64]
350350
include:
351351
- os: ubuntu-20.04
352-
install-builder-name: linux
353-
executable-path: artifacts/linux-amd64/
352+
platform-name: linux
354353
installer-extension: .run
355-
artifact-name: arduino-create-agent-ubuntu-20.04-amd64
356354
- os: windows-2019
357355
arch: 386
358-
install-builder-name: windows
359-
executable-path: artifacts/windows/
356+
platform-name: windows
360357
extension: .exe
361358
installer-extension: .exe
362-
artifact-name: arduino-create-agent-windows-2019-386
363359
- os: windows-2019
364-
install-builder-name: windows
365-
executable-path: artifacts/windows/
360+
platform-name: windows
366361
extension: .exe
367362
installer-extension: .exe
368-
artifact-name: arduino-create-agent-windows-2019-amd64
369363

370364
container:
371365
image: floydpink/ubuntu-install-builder:22.10.0
@@ -380,19 +374,19 @@ jobs:
380374
- name: Download artifact
381375
uses: actions/download-artifact@v3
382376
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
385379

386380
# zip artifacts do not mantain executable permission
387381
- 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 }}*
389383
if: matrix.os == 'ubuntu-20.04'
390384

391385
- 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 }}
393387

394388
- 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 }}
396390
if: matrix.os == 'ubuntu-20.04'
397391

398392
- name: Save InstallBuilder license to file
@@ -405,16 +399,16 @@ jobs:
405399
# installbuilder reads the env vars with certs paths and use it to sign the installer.
406400
- name: Launch Bitrock installbuilder
407401
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 }}
409403
410404
- 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}}
412406
if: matrix.os == 'ubuntu-20.04'
413407

414408
- name: Upload artifacts
415409
uses: actions/upload-artifact@v3
416410
with:
417-
name: ArduinoCreateAgent-${{ matrix.install-builder-name }}-${{ matrix.arch }}
411+
name: ArduinoCreateAgent-${{ matrix.platform-name }}-${{ matrix.arch }}
418412
path: ArduinoCreateAgent*
419413
if-no-files-found: error
420414

0 commit comments

Comments
 (0)