Skip to content

Commit 21384b7

Browse files
umbynosumbynos
committed
removed - in arch matrix variable for clarity
1 parent a6d6d05 commit 21384b7

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

‎.github/workflows/release.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: [ubuntu-20.04, windows-2019, macos-12]
34-
arch: [-amd64]
34+
arch: [amd64]
3535
include:
3636
- os: windows-2019
37-
arch: -386
37+
arch: 386
3838
ext: ".exe"
3939
- os: windows-2019
4040
ext: ".exe"
@@ -104,11 +104,11 @@ jobs:
104104
env:
105105
GOARCH: 386 # 32bit architecture (for support)
106106
run: task go:build-win
107-
if: matrix.os == 'windows-2019' && matrix.arch == '-386'
107+
if: matrix.os == 'windows-2019' && matrix.arch == '386'
108108

109109
- name: Build the Agent for win64
110110
run: task go:build-win # GOARCH=amd64 by default on the runners
111-
if: matrix.os == 'windows-2019' && matrix.arch == '-amd64'
111+
if: matrix.os == 'windows-2019' && matrix.arch == 'amd64'
112112

113113
- name: Build the Agent for macos
114114
env:
@@ -121,7 +121,7 @@ jobs:
121121
# this will create `public/` dir with compressed full bin (<version>/<os>-<arch>.gz) and a json file
122122
- name: Create autoupdate files
123123
run: go-selfupdate ${{ env.PROJECT_NAME }}${{ matrix.ext }} ${TAG_VERSION}
124-
if: matrix.arch != '-386' && steps.prerelease.outputs.IS_PRE != 'true'
124+
if: matrix.arch != '386' && steps.prerelease.outputs.IS_PRE != 'true'
125125

126126
# for now we do not distribute m1 build, this is a workaround for now
127127
- name: Copy autoupdate file for darwin-arm64 (m1 arch)
@@ -132,8 +132,8 @@ jobs:
132132
if: matrix.os == 'macos-12' && steps.prerelease.outputs.IS_PRE != 'true'
133133

134134
- name: Create autoupdate files for win32
135-
run: go-selfupdate -platform windows${{ matrix.arch }} ${{ env.PROJECT_NAME }}${{ matrix.ext }} ${TAG_VERSION}
136-
if: matrix.arch == '-386' && matrix.os == 'windows-2019' && steps.prerelease.outputs.IS_PRE != 'true'
135+
run: go-selfupdate -platform windows-${{ matrix.arch }} ${{ env.PROJECT_NAME }}${{ matrix.ext }} ${TAG_VERSION}
136+
if: matrix.arch == '386' && matrix.os == 'windows-2019' && steps.prerelease.outputs.IS_PRE != 'true'
137137

138138
- name: Upload autoupdate files to Arduino downloads servers
139139
run: |
@@ -144,7 +144,7 @@ jobs:
144144
- name: Upload artifacts
145145
uses: actions/upload-artifact@v3
146146
with:
147-
name: ${{ env.PROJECT_NAME }}-${{ matrix.os }}${{ matrix.arch }}
147+
name: ${{ env.PROJECT_NAME }}-${{ matrix.os }}-${{ matrix.arch }}
148148
path: |
149149
${{ env.PROJECT_NAME }}*
150150
if-no-files-found: error
@@ -345,15 +345,15 @@ jobs:
345345
fail-fast: false # if one os is failing continue nonetheless
346346
matrix: # used to generate installers for different OS and not for runs-on
347347
os: [ubuntu-20.04, windows-2019, macos-12]
348-
arch: [-amd64]
348+
arch: [amd64]
349349
include:
350350
- os: ubuntu-20.04
351351
install-builder-name: linux
352352
executable-path: artifacts/linux-amd64/
353353
installer-extension: .run
354354
artifact-name: arduino-create-agent-ubuntu-20.04-amd64
355355
- os: windows-2019
356-
arch: -386
356+
arch: 386
357357
install-builder-name: windows
358358
executable-path: artifacts/windows/
359359
extension: .exe
@@ -424,16 +424,16 @@ jobs:
424424
# installbuilder reads the env vars with certs paths and use it to sign the installer.
425425
- name: Launch Bitrock installbuilder
426426
run: |
427-
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars "${{ env.INSTALLER_VARS }} architecture=${{ matrix.arch }}"
427+
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} architecture=${{ matrix.arch }}
428428
429429
- name: Generate archive
430-
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}}
430+
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}}
431431
if: matrix.os == 'ubuntu-20.04'
432432

433433
- name: Upload artifacts
434434
uses: actions/upload-artifact@v3
435435
with:
436-
name: ArduinoCreateAgent-${{ matrix.install-builder-name }}${{ matrix.arch }}
436+
name: ArduinoCreateAgent-${{ matrix.install-builder-name }}-${{ matrix.arch }}
437437
path: ArduinoCreateAgent*
438438
if-no-files-found: error
439439

@@ -442,19 +442,19 @@ jobs:
442442
needs: package
443443
strategy:
444444
matrix:
445-
arch: [-amd64]
445+
arch: [amd64]
446446

447447
runs-on: macos-12
448448
steps:
449449
- name: Download artifact
450450
uses: actions/download-artifact@v3
451451
with:
452-
name: ArduinoCreateAgent-osx${{ matrix.arch }}
452+
name: ArduinoCreateAgent-osx$-{{ matrix.arch }}
453453
path: ArduinoCreateAgent-osx
454454

455455
# zip artifacts do not mantain executable permission
456456
- name: Make executable
457-
run: chmod -v +x ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx${{ matrix.arch }}-installer.app/Contents/MacOS/*
457+
run: chmod -v +x ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx-${{ matrix.arch }}-installer.app/Contents/MacOS/*
458458

459459
- name: Import Code-Signing Certificates
460460
run: |
@@ -484,33 +484,33 @@ jobs:
484484
# gon does not allow env variables in config file (https://github.com/mitchellh/gon/issues/20)
485485
run: |
486486
cat > gon.config_installer.hcl <<EOF
487-
source = ["ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx${{ matrix.arch }}-installer.app"]
487+
source = ["ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx-${{ matrix.arch }}-installer.app"]
488488
bundle_id = "cc.arduino.${{ env.PROJECT_NAME }}-installer"
489489
490490
sign {
491491
application_identity = "Developer ID Application: ARDUINO SA (7KT7ZWMCJT)"
492492
}
493493
494494
dmg {
495-
output_path = "ArduinoCreateAgent-${GITHUB_REF##*/}-osx${{ matrix.arch }}-installer.dmg"
495+
output_path = "ArduinoCreateAgent-${GITHUB_REF##*/}-osx-${{ matrix.arch }}-installer.dmg"
496496
volume_name = "ArduinoCreateAgent"
497497
}
498498
EOF
499499
500500
- name: Code sign and notarize app
501501
run: |
502-
echo "gon will notarize executable in ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx${{ matrix.arch }}-installer.app"
502+
echo "gon will notarize executable in ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx-${{ matrix.arch }}-installer.app"
503503
gon -log-level=debug -log-json gon.config_installer.hcl
504504
timeout-minutes: 30
505505

506506
# tar dmg file to keep executable permission
507507
- name: Tar files to keep permissions
508-
run: tar -cvf ArduinoCreateAgent-${GITHUB_REF##*/}-osx${{ matrix.arch }}-installer.tar ArduinoCreateAgent-${GITHUB_REF##*/}-osx${{ matrix.arch }}-installer.dmg
508+
run: tar -cvf ArduinoCreateAgent-${GITHUB_REF##*/}-osx-${{ matrix.arch }}-installer.tar ArduinoCreateAgent-${GITHUB_REF##*/}-osx-${{ matrix.arch }}-installer.dmg
509509

510510
- name: Upload artifacts
511511
uses: actions/upload-artifact@v3
512512
with:
513-
name: ArduinoCreateAgent-osx${{ matrix.arch }}
513+
name: ArduinoCreateAgent-osx-${{ matrix.arch }}
514514
path: ArduinoCreateAgent*.tar
515515
if-no-files-found: error
516516

0 commit comments

Comments
 (0)