Skip to content

Commit b62a2ff

Browse files
committed
remove the cert generation from the installer, remove duplicate step
1 parent 3a5cb38 commit b62a2ff

File tree

1 file changed

+4
-25
lines changed

1 file changed

+4
-25
lines changed

.github/workflows/release.yml

+4-25
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,6 @@ jobs:
334334
INSTALLBUILDER_PATH: "/opt/installbuilder-22.10.0/bin/builder"
335335
INSTALLER_VARS: "project.outputDirectory=$PWD project.version=${GITHUB_REF##*/} workspace=$PWD realname=Arduino_Create_Agent"
336336
# vars passed to installbuilder to install https certs automatically
337-
CERT_INSTALL: "ask_certificates_install=CI" # win(edge),mac(safari)
338-
NO_CERT_INSTALL: "ask_certificates_install=CS" # linux
339-
CHOICE_CERT_INSTALL: "ask_certificates_install=CC" # win,mac:(ff,chrome)
340337
CREATE_OSX_BUNDLED_MG: 0 # tell installbuilder to not create the DMG, gon will take care of that later
341338
# installbuilder will read this vars automatically (defined in installer.xml):
342339
INSTALLER_CERT_WINDOWS_PASSWORD: ${{ secrets.INSTALLER_CERT_WINDOWS_PASSWORD }}
@@ -353,24 +350,22 @@ jobs:
353350
- os: ubuntu-20.04
354351
install-builder-name: linux
355352
executable-path: artifacts/linux-amd64/
353+
installer-extension: .tar.gz
356354
artifact-name: arduino-create-agent-ubuntu-20.04-amd64
357355
- os: windows-2019
358356
arch: -386
359-
browser: edge
360357
install-builder-name: windows
361358
executable-path: artifacts/windows/
362359
extension: .exe
363360
installer-extension: .exe
364361
artifact-name: arduino-create-agent-windows-2019-386
365362
- os: windows-2019
366-
browser: edge
367363
install-builder-name: windows
368364
executable-path: artifacts/windows/
369365
extension: .exe
370366
installer-extension: .exe
371367
artifact-name: arduino-create-agent-windows-2019-amd64
372368
- os: macos-12
373-
browser: safari
374369
install-builder-name: osx
375370
executable-path: artifacts/macos/ArduinoCreateAgent.app
376371
installer-extension: .app
@@ -425,27 +420,11 @@ jobs:
425420
run: echo "${{ secrets.INSTALLER_CERT_MAC_P12 }}" | base64 --decode > ${{ env.INSTALLER_CERT_MAC_P12 }}
426421
if: matrix.os == 'macos-12'
427422

428-
# win(edge),mac(safari) -> CERT_INSTALL and win,mac:(ff,chrome) -> CHOICE_CERT_INSTALL
429423
# installbuilder reads the env vars with certs paths and use it to sign the installer.
430-
- name: Launch Bitrock installbuilder-20 with CERT_INSTALL && CHOICE_CERT_INSTALL
424+
- name: Launch Bitrock installbuilder
431425
run: |
432-
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} ${{ env.CERT_INSTALL }}
433-
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CI${{matrix.installer-extension}} ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-${{matrix.browser}}${{matrix.installer-extension}}
434-
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} ${{ env.CHOICE_CERT_INSTALL }}
435-
cp -vr ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CC${{matrix.installer-extension}} ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-chrome${{matrix.installer-extension}}
436-
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CC${{matrix.installer-extension}} ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-firefox${{matrix.installer-extension}}
437-
rm -r ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-C*
438-
if: matrix.os == 'windows-2019' || matrix.os == 'macos-12'
439-
440-
# linux
441-
- name: Launch Bitrock installbuilder-20 with NO_CERT_INSTALL
442-
run: |
443-
${{ env.INSTALLBUILDER_PATH }} build installer.xml linux-x64 --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} ${{ env.NO_CERT_INSTALL }}
444-
cp -v ArduinoCreateAgent-${GITHUB_REF##*/}-linux-x64-installer-CS.run ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-chrome.run
445-
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-linux-x64-installer-CS.run ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-firefox.run
446-
cp -v ArduinoCreateAgent-${GITHUB_REF##*/}-linux-x64-installer-CS.tar.gz ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-chrome.tar.gz
447-
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-linux-x64-installer-CS.tar.gz ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-firefox.tar.gz
448-
if: matrix.os == 'ubuntu-20.04'
426+
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }}
427+
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer${{matrix.installer-extension}} ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer${{matrix.installer-extension}}
449428
450429
- name: Upload artifacts
451430
uses: actions/upload-artifact@v3

0 commit comments

Comments
 (0)