diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-01-15 18:33:23 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-01-15 18:33:23 +0300 |
| commit | 9716f2eb01275a2005bfa37eed9843dc8f214672 (patch) | |
| tree | ca93f47117dc47b3fc6147821ede30d9a92e68bc | |
| parent | Windows: the latest Chocolatey pkg is broken (diff) | |
| download | setup-mingw-9716f2eb01275a2005bfa37eed9843dc8f214672.tar.gz setup-mingw-9716f2eb01275a2005bfa37eed9843dc8f214672.zip | |
refactoring
| -rw-r--r-- | action.yml | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -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') |