Skip to content

Commit

Permalink
fixup! ci(windows/gnu): install mingw via msys2/setup-msys2
Browse files Browse the repository at this point in the history
  • Loading branch information
rami3l committed Jun 3, 2024
1 parent e62d0da commit 5823121
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 8 deletions.
27 changes: 21 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,13 @@ jobs:
shell: powershell
if: matrix.mingwdir != ''
run: |
echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
$(
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
'C:\msys64\usr\bin' + "`r`n"
Get-Content $env:GITHUB_PATH -Raw
) | Set-Content $env:GITHUB_PATH
Get-Command x86_64-w64-mingw32-gcc
Get-Command i686-w64-mingw32-gcc
- name: Set PATH
run: |
echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
Expand Down Expand Up @@ -204,8 +209,13 @@ jobs:
shell: powershell
if: matrix.mingwdir != ''
run: |
echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
$(
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
'C:\msys64\usr\bin' + "`r`n"
Get-Content $env:GITHUB_PATH -Raw
) | Set-Content $env:GITHUB_PATH
Get-Command x86_64-w64-mingw32-gcc
Get-Command i686-w64-mingw32-gcc
- name: Set PATH
run: |
echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
Expand Down Expand Up @@ -348,8 +358,13 @@ jobs:
shell: powershell
if: matrix.mingwdir != ''
run: |
echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
$(
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
'C:\msys64\usr\bin' + "`r`n"
Get-Content $env:GITHUB_PATH -Raw
) | Set-Content $env:GITHUB_PATH
Get-Command x86_64-w64-mingw32-gcc
Get-Command i686-w64-mingw32-gcc
- name: Set PATH
run: |
echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
Expand Down
9 changes: 7 additions & 2 deletions ci/actions-templates/windows-builds-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,13 @@ jobs: # skip-master skip-pr skip-stable
shell: powershell
if: matrix.mingwdir != ''
run: |
echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
$(
'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
'C:\msys64\usr\bin' + "`r`n"
Get-Content $env:GITHUB_PATH -Raw
) | Set-Content $env:GITHUB_PATH
Get-Command x86_64-w64-mingw32-gcc
Get-Command i686-w64-mingw32-gcc
- name: Set PATH
run: |
echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
Expand Down

0 comments on commit 5823121

Please sign in to comment.