Skip to content

Commit c46740a

Browse files
committed
setup-ruby adjustment, MinGW gcc table update
1 parent 48baeb1 commit c46740a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

Ruby_and_Windows.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,17 @@ Compiled with a set of gcc tools known as MSYS. MSYS is no longer supported and
5555
Many Windows CI providers only have the most recent Ruby patch/teeny versions installed. With GitHub Actions and [ruby/setup-ruby], all Windows versions from Ruby 2.4 and later are available. There may be compatibility issues when using a current MSYS2 gcc with older Ruby patch versions.
5656

5757
| gcc \\ ruby | 2.4 | 2.5 | 2.6 | 2.7 | master |
58-
| :---: | :--- | :--- | :--- | :--- | |
58+
| :---: | :--- | :--- | :--- | :--- | :---: |
5959
| **6.3.0-3** | 2.4.1 | | | | |
60+
| **7.2.0-1** | 2.4.2 | | | | |
61+
| | 2.4.3 | | | | |
6062
| **7.2.0-2** | | 2.5.0 | | | |
63+
| **7.3.0-1** | 2.4.4 | 2.5.1 | | | |
64+
| **8.2.0-3** | 2.4.5 | 2.5.3 | | | |
6165
| **8.2.1-1** | | | 2.6.0 | | |
62-
| **8.3.0-2** | 2.4.6 | 2.5.5 | 2.6.3 | | |
66+
| | | | 2.6.1 | | |
67+
| **8.3.0-2** | 2.4.6 | 2.5.5 | 2.6.2 | | |
68+
| | | | 2.6.3 | | |
6369
| **9.2.0-1** | 2.4.7 | 2.5.6 | 2.6.4 | | |
6470
| **9.2.0-2** | 2.4.9 | 2.5.7 | 2.6.5 | 2.7.0 | |
6571
| **9.3.0-1** | | | | | mingw |

mingw.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ export const run = async () => {
165165
try {
166166
// rename files that cause build conflicts with MSYS2
167167
let badFiles = ['C:\\Strawberry\\c\\bin\\gmake.exe']
168-
badFiles.forEach( (bad) => {
169-
if (fs.existsSync(bad)) { fs.renameSync(bad, `${bad}_`) }
170-
})
168+
// badFiles.forEach( (bad) => {
169+
// if (fs.existsSync(bad)) { fs.renameSync(bad, `${bad}_`) }
170+
// })
171171

172172
if (mingw !== '' || msys2 !== '') {
173173
if (ruby.abiVers >= '2.4.0') {

0 commit comments

Comments
 (0)