Skip to content

Commit c104b8d

Browse files
ntkmentkme
committed
Downgrade mingw-w64@r688 on clangarm64
1 parent 86e1729 commit c104b8d

File tree

3 files changed

+42
-26
lines changed

3 files changed

+42
-26
lines changed

‎.github/workflows/build.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
- os: windows-2022
120120
sys: mingw64
121121
env: x86_64
122-
variant: -gcc@14-openssl@1.1
122+
variant: -mingw-w64@r688-gcc@14-openssl@1.1
123123
install: >-
124124
crt-git-12.0.0.r688.g6b2176247-1
125125
headers-git-12.0.0.r688.g6b2176247-1
@@ -133,7 +133,7 @@ jobs:
133133
- os: windows-2022
134134
sys: ucrt64
135135
env: ucrt-x86_64
136-
variant: -gcc@14
136+
variant: -mingw-w64@r688-gcc@14
137137
install: >-
138138
crt-git-12.0.0.r688.g6b2176247-1
139139
headers-git-12.0.0.r688.g6b2176247-1
@@ -146,7 +146,7 @@ jobs:
146146
- os: windows-2022
147147
sys: ucrt64
148148
env: ucrt-x86_64
149-
variant: -gcc@14-openssl@1.1
149+
variant: -mingw-w64@r688-gcc@14-openssl@1.1
150150
install: >-
151151
crt-git-12.0.0.r688.g6b2176247-1
152152
headers-git-12.0.0.r688.g6b2176247-1
@@ -157,6 +157,17 @@ jobs:
157157
gcc-14.2.0-3
158158
gcc-libs-14.2.0-3
159159
openssl-1.1.1.w-1
160+
- os: windows-11-arm
161+
sys: clangarm64
162+
env: clang-aarch64
163+
variant: -mingw-w64@r688
164+
install: >-
165+
crt-git-12.0.0.r688.g6b2176247-1
166+
headers-git-12.0.0.r688.g6b2176247-1
167+
libmangle-git-12.0.0.r688.g6b2176247-1
168+
libwinpthread-git-12.0.0.r688.g6b2176247-1
169+
tools-git-12.0.0.r688.g6b2176247-1
170+
winpthreads-git-12.0.0.r688.g6b2176247-1
160171
steps:
161172
- name: Download MSYS2
162173
uses: actions/download-artifact@v4
@@ -324,21 +335,25 @@ jobs:
324335
- os: windows-2022
325336
ruby-version: '3.0'
326337
sys: mingw64
327-
variant: -gcc@14-openssl@1.1
338+
variant: -mingw-w64@r688-gcc@14-openssl@1.1
328339
- os: windows-2022
329340
ruby-version: '3.1'
330341
sys: ucrt64
331-
variant: -gcc@14-openssl@1.1
342+
variant: -mingw-w64@r688-gcc@14-openssl@1.1
332343
- os: windows-2022
333344
ruby-version: '3.2.8'
334345
sys: ucrt64
335-
variant: -gcc@14
346+
variant: -mingw-w64@r688-gcc@14
336347
- os: windows-2022
337348
ruby-version: head
338349
sys: ucrt64
339350
- os: windows-11-arm
340-
ruby-version: '3.4'
351+
ruby-version: '3.4.3'
341352
sys: clangarm64
353+
variant: -mingw-w64@r688
354+
# - os: windows-11-arm
355+
# ruby-version: head
356+
# sys: clangarm64
342357
- os: windows-2022
343358
ruby-version: mswin
344359
sys: ucrt64
@@ -432,7 +447,7 @@ jobs:
432447
run: ruby -r open-uri -e 'puts URI.open("https://rubygems.org/") { |f| f.read(1024) }'
433448

434449
- name: C extension test
435-
run: gem install --platform ruby --verbose date fiddle openssl psych && ruby -r date -r fiddle -r openssl -r psych -e exit
450+
run: gem install --platform ruby date fiddle openssl psych && ruby -r date -r fiddle -r openssl -r psych -e exit
436451

437452
changelog:
438453
needs: [msys2, msys2-extra, vcpkg]

‎README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,11 @@ Rubies with GitHub Actions.
77

88
## Release Assets
99

10-
| Name | Used by Ruby |
11-
|---------------------------------------|-----------------|
12-
| `msys2-clangarm64.7z` | `>= 3.4` |
13-
| `msys2-mingw64-gcc@14-openssl@1.1.7z` | `>= 2.4, < 3.1` |
14-
| `msys2-mingw64.7z` | |
15-
| `msys2-ucrt64-gcc@14-openssl@1.1.7z` | `>= 3.1, < 3.2` |
16-
| `msys2-ucrt64-gcc@14.7z` | `>= 3.2, < 3.5` |
17-
| `msys2-ucrt64.7z` | `>= 3.5` |
18-
| `vcpkg-arm64-windows.7z` | `mswin` |
19-
| `vcpkg-x64-windows.7z` | `mswin` |
20-
2110
The code installs the MSYS2 and vcpkg packages with GitHub Actions. If any packages have been
2211
updated since the latest release, it creates a new release and uploads all packages.
2312

13+
See [`windows-toolchain.json`](./windows-toolchain.json).
14+
2415
## Dependency Pinning
2516

2617
### MSYS2
@@ -32,11 +23,13 @@ If a specific version of a dependency is needed:
3223

3324
- Upload packages to [msys2-packages](https://github.com/ruby/setup-msys2-gcc/releases/tag/msys2-packages).
3425
- Update `msys2-extra` matrix job.
26+
- Update `windows-toolchain.json` if needed.
3527
- Update [ruby/setup-ruby](https://github.com/ruby/setup-ruby) if needed.
3628

3729
### vcpkg
3830

3931
If a specific version of a dependency is needed:
4032

4133
- Update `vcpkg.json` defined in the `vcpkg` matrix job.
34+
- Update `windows-toolchain.json` if needed.
4235
- Update [ruby/setup-ruby](https://github.com/ruby/setup-ruby) if needed.

‎windows-toolchain.json

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@
1212
"href": "msys2-clangarm64.7z",
1313
"platform": "aarch64-mingw-ucrt",
1414
"required_ruby_version": [
15-
[">= 3.4.dev"]
15+
[">= 3.4.4"]
16+
]
17+
},
18+
{
19+
"name": "msys2-clangarm64-mingw-w64@r688",
20+
"href": "msys2-clangarm64-mingw-w64@r688.7z",
21+
"platform": "aarch64-mingw-ucrt",
22+
"required_ruby_version": [
23+
[">= 3.4.dev", "< 3.4.4"]
1624
]
1725
},
1826
{
@@ -26,8 +34,8 @@
2634
]
2735
},
2836
{
29-
"name": "msys2-ucrt64-gcc@14",
30-
"href": "msys2-ucrt64-gcc@14.7z",
37+
"name": "msys2-ucrt64-mingw-w64@r688-gcc@14",
38+
"href": "msys2-ucrt64-mingw-w64@r688-gcc@14.7z",
3139
"platform": "x64-mingw-ucrt",
3240
"required_ruby_version": [
3341
[">= 3.4.dev", "< 3.4.4"],
@@ -36,8 +44,8 @@
3644
]
3745
},
3846
{
39-
"name": "msys2-ucrt64-gcc@14-openssl@1.1",
40-
"href": "msys2-ucrt64-gcc@14-openssl@1.1.7z",
47+
"name": "msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1",
48+
"href": "msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z",
4149
"platform": "x64-mingw-ucrt",
4250
"required_ruby_version": [
4351
[">= 3.1.dev", "< 3.2.dev"]
@@ -52,8 +60,8 @@
5260
]
5361
},
5462
{
55-
"name": "msys2-mingw64-gcc@14-openssl@1.1",
56-
"href": "msys2-mingw64-gcc@14-openssl@1.1.7z",
63+
"name": "msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1",
64+
"href": "msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z",
5765
"platform": "x64-mingw32",
5866
"required_ruby_version": [
5967
[">= 2.4.dev", "< 3.1.dev"]

0 commit comments

Comments
 (0)