Skip to content

Commit 147989b

Browse files
committed
the _cli binary is no more required since it correctly starts even on systems without a tray bar with this error:
``` systray error: failed to register our icon with the notifier watcher (maybe no tray is running?): The name org.kde.StatusNotifierWatcher was not provided by any .service files ```
1 parent 92dd883 commit 147989b

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

.github/workflows/publish-go-tester-task.yml

-5
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ jobs:
103103
run: task go:build
104104
if: runner.os == 'Linux'
105105

106-
# build the agent without GUI support (no tray icon)
107-
- name: Build the Agent-cli
108-
run: task go:build-cli
109-
if: runner.os == 'Linux'
110-
111106
# the manifest is required by windows GUI apps, otherwise the binary will crash with: "Unable to create main window: TTM_ADDTOOL failed" (for reference https://github.com/lxn/walk/issues/28)
112107
# rsrc will produce a *.syso file that should get automatically recognized by go build command and linked into an executable.
113108
- name: Download tool to embed manifest in win binary

.github/workflows/release.yml

-9
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ jobs:
8585
run: task go:build
8686
if: matrix.os == 'ubuntu-20.04'
8787

88-
# build the agent without GUI support (no tray icon)
89-
- name: Build the Agent-cli
90-
run: task go:build-cli
91-
if: matrix.os == 'ubuntu-20.04'
92-
9388
# the manifest is required by windows GUI apps, otherwise the binary will crash with: "Unable to create main window: TTM_ADDTOOL failed" (for reference https://github.com/lxn/walk/issues/28)
9489
# rsrc will produce a *.syso file that should get automatically recognized by go build command and linked into an executable.
9590
- name: Download tool to embed manifest in win binary
@@ -375,10 +370,6 @@ jobs:
375370
run: mv -v ${{ matrix.executable-path }}${{ env.PROJECT_NAME }}${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Agent${{ matrix.extension }}
376371
if: matrix.os != 'macos-12'
377372

378-
- name: Rename executable to Arduino_Create_Agent_cli
379-
run: mv -v ${{ matrix.executable-path }}${{ env.PROJECT_NAME }}_cli${{ matrix.extension }} ${{ matrix.executable-path }}Arduino_Create_Agent_cli${{ matrix.extension }}
380-
if: matrix.os == 'ubuntu-20.04'
381-
382373
- name: Save InstallBuilder license to file
383374
run: echo "${{ secrets.INSTALLER_LICENSE }}" > /tmp/license.xml
384375

.github/workflows/test-go-integration-task.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ jobs:
9393
repo-token: ${{ secrets.GITHUB_TOKEN }}
9494
version: 3.x
9595

96-
# build the agent without GUI support (no tray icon) for integration testing
96+
# build the agent for integration testing
9797
- name: Build the Agent-cli
98-
run: task go:build-cli
98+
run: task go:build
9999
if: matrix.operating-system != 'windows-latest'
100100

101101
- name: Build the Agent-cli for win

tests/conftest.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626

2727
@pytest.fixture(scope="function")
2828
def agent(pytestconfig):
29-
30-
agent_cli = str(Path(pytestconfig.rootdir) / "arduino-create-agent_cli")
29+
if platform.system() == "Windows":
30+
agent = str(Path(pytestconfig.rootdir) / "arduino-create-agent_cli.exe")
31+
else:
32+
agent = str(Path(pytestconfig.rootdir) / "arduino-create-agent")
3133
env = {
3234
# "ARDUINO_DATA_DIR": data_dir,
3335
# "ARDUINO_DOWNLOADS_DIR": downloads_dir,
@@ -39,7 +41,7 @@ def agent(pytestconfig):
3941

4042
cd_command = "cd"
4143
with run_context.prefix(f'{cd_command} ..'):
42-
runner.run(agent_cli, echo=True, hide=True, warn=True, env=env, asynchronous=True)
44+
runner.run(agent, echo=True, hide=True, warn=True, env=env, asynchronous=True)
4345

4446
# we give some time to the agent to start and listen to
4547
# incoming requests

0 commit comments

Comments
 (0)