Skip to content

Commit 7221d00

Browse files
authored
Merge pull request #7985 from drinkcat/bump_onig_windows_reenable
Reenable windows-latest/x86_64-pc-windows-gnu (and do not update gcc)
2 parents 705c2f1 + aa3947a commit 7221d00

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

.github/workflows/CICD.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,7 @@ jobs:
528528
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
529529
- { os: macos-13 , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }
530530
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
531-
# TODO: Re-enable after rust-onig release: https://github.com/rust-onig/rust-onig/issues/193
532-
# - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
531+
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
533532
- { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
534533
- { os: windows-latest , target: aarch64-pc-windows-msvc , features: feat_os_windows, use-cross: use-cross , skip-tests: true }
535534
steps:
@@ -694,11 +693,6 @@ jobs:
694693
sudo apt-get -y update
695694
sudo apt-get -y install fuse3 libfuse-dev
696695
;;
697-
# Update binutils if MinGW due to https://github.com/rust-lang/rust/issues/112368
698-
x86_64-pc-windows-gnu)
699-
C:/msys64/usr/bin/pacman.exe -Sy --needed mingw-w64-x86_64-gcc --noconfirm
700-
echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
701-
;;
702696
esac
703697
case '${{ matrix.job.os }}' in
704698
macos-latest) brew install coreutils ;; # needed for testing

0 commit comments

Comments
 (0)