From 9716f2eb01275a2005bfa37eed9843dc8f214672 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 15 Jan 2021 18:33:23 +0300 Subject: refactoring --- action.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/action.yml b/action.yml index 5a0713f..bde223a 100644 --- a/action.yml +++ b/action.yml @@ -144,15 +144,8 @@ runs: $mingw = if ($x64) { $mingw64 } else { $mingw32 } $mingw_install = Join-Path C: ProgramData chocolatey lib mingw tools install - - $mingw32_root = Join-Path $mingw_install $mingw32 - $mingw64_root = Join-Path $mingw_install $mingw64 $mingw_root = Join-Path $mingw_install $mingw - - $mingw32_bin = Join-Path $mingw32_root bin - $mingw64_bin = Join-Path $mingw64_root bin $mingw_bin = Join-Path $mingw_root bin - $mingw_lib = Join-Path $mingw_root $prefix lib $pkg = 'mingw' @@ -166,11 +159,10 @@ runs: Remove-Package $pkg if ($x64) { Install-Package $pkg --version $version - echo $mingw64_bin >> $env:GITHUB_PATH } else { Install-Package $pkg --version $version --x86 - echo $mingw32_bin >> $env:GITHUB_PATH } + echo $mingw_bin >> $env:GITHUB_PATH if ($static_workaround) { Remove-Item (Join-Path $mingw_lib 'libpthread.dll.a') -- cgit v1.2.3