Skip to content

Commit 7834297

Browse files
authored
Update for Windows arm and CI updates (OS's & Rubies) (#45)
* Update for Windows arm * CI: Update OS's * Windows arm - run `gem install openssl`
1 parent 1493c00 commit 7834297

File tree

5 files changed

+5411
-4724
lines changed

5 files changed

+5411
-4724
lines changed

.github/workflows/ruby.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,27 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [ ubuntu-22.04, ubuntu-20.04, macos-13, macos-12, macos-11 ]
24-
ruby: [ ruby-head, 3.3, 3.2, 3.1, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ]
23+
os: [ ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04, macos-15, macos-14, macos-13 ]
24+
ruby: [ ruby-head, 3.4, 3.3, 3.2, 3.1, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ]
2525
exclude:
26-
- { os: ubuntu-22.04 , ruby: 2.2 }
26+
- { os: ubuntu-22.04 , ruby: 2.2 }
27+
- { os: ubuntu-24.04 , ruby: 2.2 }
28+
- { os: ubuntu-24.04 , ruby: 2.5 }
29+
- { os: ubuntu-24.04 , ruby: 2.7 }
30+
- { os: ubuntu-24.04 , ruby: '3.0' }
31+
- { os: ubuntu-24.04-arm, ruby: 2.5 }
32+
- { os: ubuntu-24.04-arm, ruby: 2.2 }
33+
- { os: ubuntu-24.04-arm, ruby: 2.5 }
34+
- { os: ubuntu-24.04-arm, ruby: 2.7 }
35+
- { os: macos-14 , ruby: 2.2 }
36+
- { os: macos-14 , ruby: 2.4 }
37+
- { os: macos-14 , ruby: 2.5 }
38+
- { os: macos-14 , ruby: 2.6 }
39+
- { os: macos-15 , ruby: 2.2 }
40+
- { os: macos-15 , ruby: 2.4 }
41+
- { os: macos-15 , ruby: 2.5 }
42+
- { os: macos-15 , ruby: 2.6 }
43+
2744
runs-on: ${{ matrix.os }}
2845
steps:
2946
- name: Checkout
@@ -55,8 +72,11 @@ jobs:
5572
strategy:
5673
fail-fast: false
5774
matrix:
58-
os: [ windows-2022, windows-2019 ]
59-
ruby: [ mswin, mingw, ucrt, head, 3.3, 3.2, 3.1, '3.0', 2.5, 2.4, 2.3, 2.2 ]
75+
os: [ windows-2025, windows-2022 ]
76+
ruby: [ mswin, mingw, ucrt, head, 3.4, 3.3, 3.2, 3.1, '3.0', 2.5, 2.4, 2.3, 2.2 ]
77+
include:
78+
- { os: windows-11-arm , ruby: 3.4 }
79+
- { os: windows-11-arm , ruby: head }
6080
runs-on: ${{ matrix.os }}
6181
steps:
6282
- name: Checkout
@@ -96,6 +116,5 @@ jobs:
96116

97117
- name: gem install openssl
98118
if: |
99-
((matrix.ruby >= '2.5') && (matrix.os == 'windows-2019'))
100-
|| ((matrix.ruby >= '2.4') && (matrix.os >= 'windows-2022'))
119+
((matrix.ruby >= '2.4') && ((matrix.os >= 'windows-2022') || (matrix.os >= 'windows-11-arm')))
101120
run: gem install openssl -N

common.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,7 @@ export const updateKeyRing = async (vers) => {
117117
await download(uri, fn)
118118
await download(`${uri}.sig`, `${fn}.sig`)
119119

120-
const origPath = process.env.Path
121-
process.env.Path = `C:\\msys64\\usr\\bin;C:\\msys64\\mingw64\\bin;${origPath}`
122-
123-
execSync(`C:\\msys64\\usr\\bin\\pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
124-
process.env['Path'] = origPath
120+
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
125121

126122
grpEnd(msSt)
127123
}

0 commit comments

Comments
 (0)