mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-27 11:07:44 +00:00
Merge pull request #7985 from drinkcat/bump_onig_windows_reenable
Reenable windows-latest/x86_64-pc-windows-gnu (and do not update gcc)
This commit is contained in:
commit
7221d000bc
1 changed files with 1 additions and 7 deletions
8
.github/workflows/CICD.yml
vendored
8
.github/workflows/CICD.yml
vendored
|
@ -528,8 +528,7 @@ jobs:
|
||||||
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
|
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
|
||||||
- { os: macos-13 , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }
|
- { os: macos-13 , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }
|
||||||
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
|
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
|
||||||
# TODO: Re-enable after rust-onig release: https://github.com/rust-onig/rust-onig/issues/193
|
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
|
||||||
# - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
|
|
||||||
- { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
|
- { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
|
||||||
- { os: windows-latest , target: aarch64-pc-windows-msvc , features: feat_os_windows, use-cross: use-cross , skip-tests: true }
|
- { os: windows-latest , target: aarch64-pc-windows-msvc , features: feat_os_windows, use-cross: use-cross , skip-tests: true }
|
||||||
steps:
|
steps:
|
||||||
|
@ -694,11 +693,6 @@ jobs:
|
||||||
sudo apt-get -y update
|
sudo apt-get -y update
|
||||||
sudo apt-get -y install fuse3 libfuse-dev
|
sudo apt-get -y install fuse3 libfuse-dev
|
||||||
;;
|
;;
|
||||||
# Update binutils if MinGW due to https://github.com/rust-lang/rust/issues/112368
|
|
||||||
x86_64-pc-windows-gnu)
|
|
||||||
C:/msys64/usr/bin/pacman.exe -Sy --needed mingw-w64-x86_64-gcc --noconfirm
|
|
||||||
echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
case '${{ matrix.job.os }}' in
|
case '${{ matrix.job.os }}' in
|
||||||
macos-latest) brew install coreutils ;; # needed for testing
|
macos-latest) brew install coreutils ;; # needed for testing
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue