From d89c9a6072946facfbc2289e17fefdec23479d1a Mon Sep 17 00:00:00 2001 From: Ed_ Date: Fri, 25 Oct 2024 13:11:21 -0400 Subject: [PATCH] de-hardcode target_arch.psm1 import --- scripts/build.ci.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build.ci.ps1 b/scripts/build.ci.ps1 index c3e5f52..fb5aa44 100644 --- a/scripts/build.ci.ps1 +++ b/scripts/build.ci.ps1 @@ -2,7 +2,6 @@ # It will most likely need a partial rewrite to segment the build process into separate script invocations based on the OS. # That or just rewrite it in an sh script and call it a day. -Import-Module ./helpers/target_arch.psm1 $target_arch = Join-Path $PSScriptRoot 'helpers/target_arch.psm1' $devshell = Join-Path $PSScriptRoot 'helpers/devshell.ps1' $format_cpp = Join-Path $PSScriptRoot 'helpers/format_cpp.psm1' @@ -10,6 +9,8 @@ $refactor_unreal = Join-Path $PSScriptRoot 'refactor_unreal.ps1' $incremental_checks = Join-Path $PSScriptRoot 'helpers/incremental_checks.ps1' $vendor_toolchain = Join-Path $PSScriptRoot 'helpers/vendor_toolchain.ps1' +Import-Module $target_arch + function Get-ScriptRepoRoot { $currentPath = $PSScriptRoot while ($currentPath -ne $null -and $currentPath -ne "")