Skip to content

Commit dab1ebe

Browse files
authored
Update packaging CI (#1802)
* Update Fedora to version 42, add ARM, disable Android for now * Try Android * Another fix for Android * Add missing quotes * Revert the rest of the Android changes
1 parent bfaf2ed commit dab1ebe

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

.github/workflows/package.yml

+23-13
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919

2020
jobs:
2121
linux:
22-
runs-on: ubuntu-latest
22+
runs-on: ${{ matrix.runner }}
2323
permissions:
2424
contents: write
2525
attestations: write
@@ -28,20 +28,30 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- image: ubuntu2404
31+
- runner: ubuntu-latest
32+
image: ubuntu2404
33+
config-zstd: OFF
34+
- runner: ubuntu-24.04-arm
35+
image: ubuntu2404-arm64
3236
config-zstd: OFF
33-
- image: ubuntu2204
37+
- runner: ubuntu-latest
38+
image: ubuntu2204
3439
config-zstd: OFF
35-
- image: ubuntu2204-icpx
40+
- runner: ubuntu-latest
41+
image: ubuntu2204-icpx
3642
config-zstd: OFF
3743
additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx
38-
- image: ubuntu2004
44+
- runner: ubuntu-latest
45+
image: ubuntu2004
3946
config-zstd: OFF
40-
- image: rhel94
47+
- runner: ubuntu-latest
48+
image: rhel94
4149
config-zstd: OFF
42-
- image: fedora40
50+
- runner: ubuntu-latest
51+
image: fedora42
4352
config-zstd: OFF
44-
- image: alpine320
53+
- runner: ubuntu-latest
54+
image: alpine320
4555
config-zstd: OFF
4656

4757
steps:
@@ -308,13 +318,13 @@ jobs:
308318
matrix:
309319
include:
310320
- target: "armeabi-v7a"
311-
api-version: 30
321+
api-version: 35
312322
- target: "x86"
313-
api-version: 30
323+
api-version: 35
314324
- target: "arm64-v8a"
315-
api-version: 30
325+
api-version: 35
316326
- target: "x86_64"
317-
api-version: 30
327+
api-version: 35
318328

319329
runs-on: ubuntu-latest
320330

@@ -323,7 +333,7 @@ jobs:
323333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
324334

325335
- name: Checkout lipbcap for Android
326-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # main
336+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
327337
with:
328338
repository: seladb/libpcap-android
329339
path: ./libpcap-android

0 commit comments

Comments
 (0)