Skip to content

Commit 9a52e4c

Browse files
committed
ci(package): constrain Agent MSI regeneration to windows/x86_64 artifacts
The Regenerate Agent MSI step defaults to x86_64 (tlk.ps1 architecture default) but was searching recursively across both arm64 and x86_64 directories, leaving the executable selection to chance via Select -First 1. Introduce an $x64Root variable pointing to windows\x86_64 and scope all per-architecture file lookups to that path. tun2socks and wintun are kept with a recursive search on the full PackageRoot since they live under a separate tun2socks\ subdirectory.
1 parent 0028e9c commit 9a52e4c

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/package.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,13 +472,14 @@ jobs:
472472
if: ${{ matrix.project == 'devolutions-agent' && matrix.os == 'windows' }}
473473
run: |
474474
$PackageRoot = Join-Path ${{ runner.temp }} ${{ matrix.project}}
475+
$x64Root = Join-Path $PackageRoot windows x86_64
475476
476-
$Env:DAGENT_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include '*DevolutionsAgent_*.exe' | Select -First 1
477-
$Env:DAGENT_UPDATER_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsAgentUpdater_*.exe' | Select -First 1
477+
$Env:DAGENT_EXECUTABLE = Get-ChildItem -Path $x64Root -Include '*DevolutionsAgent_*.exe' | Select -First 1
478+
$Env:DAGENT_UPDATER_EXECUTABLE = Get-ChildItem -Path $x64Root -Include 'DevolutionsAgentUpdater_*.exe' | Select -First 1
478479
$Env:DAGENT_DESKTOP_AGENT_PATH = Resolve-Path -Path "devolutions-pedm-desktop"
479-
$Env:DAGENT_PEDM_SHELL_EXT_DLL = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmShellExt.dll' | Select -First 1
480-
$Env:DAGENT_PEDM_SHELL_EXT_MSIX = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmShellExt.msix' | Select -First 1
481-
$Env:DAGENT_SESSION_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsSession.exe' | Select -First 1
480+
$Env:DAGENT_PEDM_SHELL_EXT_DLL = Get-ChildItem -Path $x64Root -Include 'DevolutionsPedmShellExt.dll' | Select -First 1
481+
$Env:DAGENT_PEDM_SHELL_EXT_MSIX = Get-ChildItem -Path $x64Root -Include 'DevolutionsPedmShellExt.msix' | Select -First 1
482+
$Env:DAGENT_SESSION_EXECUTABLE = Get-ChildItem -Path $x64Root -Include 'DevolutionsSession.exe' | Select -First 1
482483
$Env:DAGENT_TUN2SOCKS_EXE = Get-ChildItem -Path $PackageRoot -Recurse -Include 'tun2socks.exe' | Select -First 1
483484
$Env:DAGENT_WINTUN_DLL = Get-ChildItem -Path $PackageRoot -Recurse -Include 'wintun.dll' | Select -First 1
484485

0 commit comments

Comments
 (0)