Skip to content

Commit c08bff9

Browse files
benneybenney
authored andcommitted
fix ci
1 parent 97cde03 commit c08bff9

File tree

1 file changed

+7
-28
lines changed

1 file changed

+7
-28
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ jobs:
1010
matrix:
1111
os:
1212
- ubuntu-24.04
13-
- macos-12
13+
- macos-13
14+
- macos-14
1415
runs-on: ${{ matrix.os }}
1516
steps:
1617
- name: checkout scm
@@ -21,11 +22,11 @@ jobs:
2122
id: cpu-cores
2223

2324
- name: install build dependencies (Ubuntu)
24-
run: sudo apt update && sudo apt install -y build-essential nasm libgtest-dev libhwy-dev
25+
run: sudo apt update && sudo apt install -y build-essential nasm libgtest-dev libhwy-dev libisal-dev
2526
if: runner.os == 'Linux'
2627

2728
- name: install build dependencies (MacOS)
28-
run: brew install automake autoconf coreutils nasm highway
29+
run: brew install automake autoconf coreutils nasm highway googletest
2930
if: runner.os == 'macOS'
3031

3132
- name: get deflate
@@ -43,33 +44,11 @@ jobs:
4344
sudo cmake --install build
4445
cd -
4546
46-
- name: get isa-l
47-
uses: actions/checkout@v3
48-
with:
49-
repository: intel/isa-l
50-
path: src/libs/isa-l
51-
ref: v2.31.0
52-
53-
- name: build isa-l
54-
run: |
55-
cd src/libs/isa-l
56-
./autogen.sh
57-
./configure --prefix=/usr/local
58-
make -j ${{ steps.cpu-cores.outputs.count }}
59-
sudo make install
60-
cd -
61-
62-
- name: make fatsp (MacOS)
47+
- name: make fastplong
6348
run: bash -c 'make -j $(nproc)'
64-
if: runner.os == 'macOS'
6549

66-
- name: make fastp static (Ubuntu)
67-
run: bash -c 'make -j $(nproc) static'
68-
if: runner.os == 'Linux'
69-
70-
- name: make test (Ubuntu)
71-
run: bash -c 'make -j $(nproc) test-static'
72-
if: runner.os == 'Linux'
50+
- name: make test
51+
run: bash -c 'make -j $(nproc) test'
7352

7453
- name: test
7554
run: chmod a+x ./fastplong && ./fastplong --version

0 commit comments

Comments
 (0)