Skip to content

Commit 9379c17

Browse files
committed
fix: resolve CI failures for cross-platform builds
- Switch from native-tls to rustls-tls to eliminate OpenSSL dependency - Use native ARM runners (ubuntu-24.04-arm) instead of cross-compilation - Fix deprecated macos-13 runner by using macos-latest - Fix Windows PowerShell compatibility by adding shell: bash
1 parent 69d6bde commit 9379c17

File tree

5 files changed

+150
-268
lines changed

5 files changed

+150
-268
lines changed

.github/workflows/release-npm.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
- os: ubuntu-latest
2323
target: x86_64-unknown-linux-gnu
2424

25-
# Linux aarch64
26-
- os: ubuntu-latest
25+
# Linux aarch64 (native ARM runner)
26+
- os: ubuntu-24.04-arm
2727
target: aarch64-unknown-linux-gnu
2828

29-
# macOS x86_64
30-
- os: macos-13
29+
# macOS x86_64 (cross-compile from ARM)
30+
- os: macos-latest
3131
target: x86_64-apple-darwin
3232

3333
# macOS ARM64
@@ -71,15 +71,16 @@ jobs:
7171
- name: Test native module (if compatible)
7272
if: |
7373
(matrix.target == 'x86_64-unknown-linux-gnu' && matrix.os == 'ubuntu-latest') ||
74+
(matrix.target == 'aarch64-unknown-linux-gnu' && matrix.os == 'ubuntu-24.04-arm') ||
7475
(matrix.target == 'x86_64-pc-windows-msvc' && matrix.os == 'windows-latest') ||
75-
(matrix.target == 'x86_64-apple-darwin' && matrix.os == 'macos-13') ||
7676
(matrix.target == 'aarch64-apple-darwin' && matrix.os == 'macos-latest')
7777
working-directory: crates/feedparser-rs-node
7878
run: npm test
7979

8080
- name: List built artifacts
8181
working-directory: crates/feedparser-rs-node
82-
run: ls -lh *.node || dir *.node
82+
shell: bash
83+
run: ls -lh *.node
8384

8485
- name: Upload artifacts
8586
uses: actions/upload-artifact@v4

.github/workflows/release-pypi.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ jobs:
1313
# Build wheels for Linux
1414
linux:
1515
name: Build wheels (Linux ${{ matrix.target }})
16-
runs-on: ubuntu-latest
16+
runs-on: ${{ matrix.os }}
1717
timeout-minutes: 45
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
target: [x86_64, aarch64]
21+
include:
22+
- os: ubuntu-latest
23+
target: x86_64
24+
- os: ubuntu-24.04-arm
25+
target: aarch64
2226
steps:
2327
- uses: actions/checkout@v6
2428

@@ -44,16 +48,12 @@ jobs:
4448
# Build wheels for macOS
4549
macos:
4650
name: Build wheels (macOS ${{ matrix.target }})
47-
runs-on: ${{ matrix.os }}
51+
runs-on: macos-latest
4852
timeout-minutes: 45
4953
strategy:
5054
fail-fast: false
5155
matrix:
52-
include:
53-
- os: macos-13
54-
target: x86_64
55-
- os: macos-latest
56-
target: aarch64
56+
target: [x86_64, aarch64]
5757
steps:
5858
- uses: actions/checkout@v6
5959

0 commit comments

Comments
 (0)