Skip to content

Commit 45a2de6

Browse files
umbynosumbynos
committed
Fix naming inconstistencies (#581)
* rename "Plugin" to "Agent" * rename "Bridge" to "Agent" * reintroduce version (maj.min.bugf) instead of (maj.min) in names
1 parent 5a619db commit 45a2de6

File tree

2 files changed

+27
-46
lines changed

2 files changed

+27
-46
lines changed

‎.github/workflows/release.yml‎

Lines changed: 23 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
env:
180180
# vars used by installbuilder
181181
INSTALLBUILDER_PATH: "/opt/installbuilder-20.9.0/bin/builder"
182-
# INSTALLER_VARS: "project.outputDirectory=$PWD project.version=${GITHUB_REF##*/} workspace=$PWD realname=Arduino_Create_Bridge"
182+
INSTALLER_VARS: "project.outputDirectory=$PWD project.version=${GITHUB_REF##*/} workspace=$PWD realname=Arduino_Create_Agent"
183183
# vars passed to installbuilder to install https certs automatically
184184
CERT_INSTALL: "ask_certificates_install=CI" # win(edge),mac(safari)
185185
NO_CERT_INSTALL: "ask_certificates_install=CS" # linux
@@ -223,17 +223,6 @@ jobs:
223223
image: floydpink/ubuntu-install-builder:20.9.0
224224

225225
steps:
226-
227-
# workaround to strip bugfix number from semver (only to make 1.1 release) I will change this in the future
228-
- name: Set version env vars
229-
# VERSION will be available only in the next step
230-
run: |
231-
echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
232-
233-
- name: Set installer env vars
234-
run: |
235-
echo INSTALLER_VARS="project.outputDirectory=$PWD project.version=${VERSION%.*} workspace=$PWD realname=Arduino_Create_Bridge" >> $GITHUB_ENV
236-
237226
- name: Checkout
238227
uses: actions/checkout@v2
239228
with:
@@ -251,11 +240,11 @@ jobs:
251240
run: chmod -v +x ${{ matrix.executable-path }}arduino-create-agent*
252241
if: matrix.operating-system == 'ubuntu-18.04' || matrix.operating-system == 'macos-10.15'
253242

254-
- name: Rename executable to Arduino_Create_Bridge
255-
run: mv -v ${{ matrix.executable-path }}arduino-create-agent${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Bridge${{ matrix.extension }}
243+
- name: Rename executable to Arduino_Create_Agent
244+
run: mv -v ${{ matrix.executable-path }}arduino-create-agent${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Agent${{ matrix.extension }}
256245

257-
- name: Rename executable to Arduino_Create_Bridge_cli
258-
run: mv -v ${{ matrix.executable-path }}arduino-create-agent_cli${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Bridge_cli${{ matrix.extension }}
246+
- name: Rename executable to Arduino_Create_Agent_cli
247+
run: mv -v ${{ matrix.executable-path }}arduino-create-agent_cli${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Agent_cli${{ matrix.extension }}
259248
if: matrix.operating-system == 'ubuntu-18.04'
260249

261250
- name: Save InstallBuilder license to file
@@ -273,22 +262,22 @@ jobs:
273262
# installbuilder reads the env vars with certs paths and use it to sign the installer.
274263
- name: Launch Bitrock installbuilder-20 with CERT_INSTALL && CHOICE_CERT_INSTALL
275264
run: |
276-
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${INSTALLER_VARS} ${{ env.CERT_INSTALL }}
277-
mv -v ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CI${{matrix.installer-extension}} ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-${{matrix.browser}}${{matrix.installer-extension}}
278-
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${INSTALLER_VARS} ${{ env.CHOICE_CERT_INSTALL }}
279-
cp -vr ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CC${{matrix.installer-extension}} ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-chrome${{matrix.installer-extension}}
280-
mv -v ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CC${{matrix.installer-extension}} ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}${{ matrix.arch }}-installer-firefox${{matrix.installer-extension}}
281-
rm -r ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-C*
265+
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} ${{ env.CERT_INSTALL }}
266+
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}}
267+
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} ${{ env.CHOICE_CERT_INSTALL }}
268+
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}}
269+
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}}
270+
rm -r ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-C*
282271
if: matrix.operating-system == 'windows-2019' || matrix.operating-system == 'macos-10.15'
283272

284273
# linux
285274
- name: Launch Bitrock installbuilder-20 with NO_CERT_INSTALL
286275
run: |
287-
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${INSTALLER_VARS} ${{ env.NO_CERT_INSTALL }}
288-
cp -v ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CS.run ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-chrome.run
289-
mv -v ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CS.run ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-firefox.run
290-
cp -v ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CS.tar.gz ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-chrome.tar.gz
291-
mv -v ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-CS.tar.gz ArduinoCreateAgent-${VERSION%.*}-${{ matrix.install-builder-name }}-installer-firefox.tar.gz
276+
${{ env.INSTALLBUILDER_PATH }} build installer.xml ${{ matrix.install-builder-name }} --verbose --license /tmp/license.xml --setvars ${{ env.INSTALLER_VARS }} ${{ env.NO_CERT_INSTALL }}
277+
cp -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CS.run ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-chrome.run
278+
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CS.run ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-firefox.run
279+
cp -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CS.tar.gz ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-chrome.tar.gz
280+
mv -v ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-CS.tar.gz ArduinoCreateAgent-${GITHUB_REF##*/}-${{ matrix.install-builder-name }}-installer-firefox.tar.gz
292281
if: matrix.operating-system == 'ubuntu-18.04'
293282

294283
- name: Upload artifacts
@@ -308,22 +297,15 @@ jobs:
308297
browser: [safari, firefox, chrome]
309298

310299
steps:
311-
312300
- name: Download artifact
313301
uses: actions/download-artifact@v2
314302
with:
315303
name: ArduinoCreateAgent-osx
316304
path: ArduinoCreateAgent-osx
317305

318-
# workaround to strip bugfix number from semver (only to make 1.1 release) I will change this in the future
319-
- name: Set version env vars
320-
# VERSION will be available only in the next step
321-
run: |
322-
echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
323-
324306
# zip artifacts do not mantain executable permission
325307
- name: Make executable
326-
run: chmod -v +x ArduinoCreateAgent-osx/ArduinoCreateAgent-${VERSION%.*}-osx-installer-${{ matrix.browser }}.app/Contents/MacOS/*
308+
run: chmod -v +x ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx-installer-${{ matrix.browser }}.app/Contents/MacOS/*
327309

328310
- name: Import Code-Signing Certificates
329311
env:
@@ -346,15 +328,15 @@ jobs:
346328
# gon does not allow env variables in config file (https://github.com/mitchellh/gon/issues/20)
347329
run: |
348330
cat > gon.config_installer.hcl <<EOF
349-
source = ["ArduinoCreateAgent-osx/ArduinoCreateAgent-${VERSION%.*}-osx-installer-${{ matrix.browser }}.app"]
331+
source = ["ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx-installer-${{ matrix.browser }}.app"]
350332
bundle_id = "cc.arduino.arduino-agent-installer"
351333
352334
sign {
353335
application_identity = "Developer ID Application: ARDUINO SA (7KT7ZWMCJT)"
354336
}
355337
356338
dmg {
357-
output_path = "ArduinoCreateAgent-${VERSION%.*}-osx-installer-${{ matrix.browser }}.dmg"
339+
output_path = "ArduinoCreateAgent-${GITHUB_REF##*/}-osx-installer-${{ matrix.browser }}.dmg"
358340
volume_name = "ArduinoCreateAgent"
359341
}
360342
EOF
@@ -364,13 +346,13 @@ jobs:
364346
AC_USERNAME: ${{ secrets.AC_USERNAME }}
365347
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
366348
run: |
367-
echo "gon will notarize executable in ArduinoCreateAgent-osx/ArduinoCreateAgent-${VERSION%.*}-osx-installer-${{ matrix.browser }}.app"
349+
echo "gon will notarize executable in ArduinoCreateAgent-osx/ArduinoCreateAgent-${GITHUB_REF##*/}-osx-installer-${{ matrix.browser }}.app"
368350
gon -log-level=debug -log-json gon.config_installer.hcl
369351
timeout-minutes: 30
370352

371353
# tar dmg file to keep executable permission
372354
- name: Tar files to keep permissions
373-
run: tar -cvf ArduinoCreateAgent-${VERSION%.*}-osx-installer-${{ matrix.browser }}.tar ArduinoCreateAgent-${VERSION%.*}-osx-installer-${{ matrix.browser }}.dmg
355+
run: tar -cvf ArduinoCreateAgent-${GITHUB_REF##*/}-osx-installer-${{ matrix.browser }}.tar ArduinoCreateAgent-${GITHUB_REF##*/}-osx-installer-${{ matrix.browser }}.dmg
374356

375357
- name: Upload artifacts
376358
uses: actions/upload-artifact@v2
@@ -383,12 +365,11 @@ jobs:
383365
runs-on: ubuntu-18.04
384366
needs: code-sign-mac-installers
385367
env:
386-
PLUGIN_TARGET: "/CreateBridgeStable/"
368+
TARGET: "/CreateBridgeStable/"
387369
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
388370
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
389371

390372
steps:
391-
392373
- name: Download artifact
393374
uses: actions/download-artifact@v2 # download all the artifacts
394375

@@ -452,5 +433,5 @@ jobs:
452433
file: release/*
453434

454435
- name: Upload release files on Arduino downloads servers
455-
run: aws s3 sync release/ s3://${{ secrets.DOWNLOADS_BUCKET }}${{ env.PLUGIN_TARGET }} --include "*"
436+
run: aws s3 sync release/ s3://${{ secrets.DOWNLOADS_BUCKET }}${{ env.TARGET }} --include "*"
456437
if: steps.prerelease.outputs.IS_PRE != 'true'

‎systray/systray_real.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func (s *Systray) start() {
4848
s.updateMenuItem(mRmCrashes, s.CrashesIsEmpty())
4949

5050
// Add pause/quit
51-
mPause := systray.AddMenuItem("Pause Plugin", "")
51+
mPause := systray.AddMenuItem("Pause Agent", "")
5252
systray.AddSeparator()
53-
mQuit := systray.AddMenuItem("Quit Plugin", "")
53+
mQuit := systray.AddMenuItem("Quit Agent", "")
5454

5555
// Add configs
5656
s.addConfigs()
@@ -116,9 +116,9 @@ func (s *Systray) RemoveCrashes() {
116116
func (s *Systray) startHibernate() {
117117
systray.SetIcon(icon.GetIconHiber())
118118

119-
mResume := systray.AddMenuItem("Resume Plugin", "")
119+
mResume := systray.AddMenuItem("Resume Agent", "")
120120
systray.AddSeparator()
121-
mQuit := systray.AddMenuItem("Quit Plugin", "")
121+
mQuit := systray.AddMenuItem("Quit Agent", "")
122122

123123
// listen for events
124124
go func() {

0 commit comments

Comments
 (0)