Skip to content

Commit 5a270a9

Browse files
serge-sans-pailleserge-sans-paille
committed
Cleanup github actions
Mostly use cmake CLI in a more straight-forward way, reindent stuff and remove redundant or useless steps.
1 parent 47f11cd commit 5a270a9

File tree

13 files changed

+71
-98
lines changed

13 files changed

+71
-98
lines changed

‎.github/workflows/android.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ jobs:
2525
TARGET: ${{ matrix.target }}
2626
API: ${{ matrix.api }}
2727
run: |
28-
mkdir _build
2928
NDK="$($ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --list_installed | sed -E 's/( +[|] +)/|/g;s/ +$//' | grep '^ ndk' | cut -d '|' -f 4 | sort | head -n1)"
30-
cd _build && \
31-
cmake .. -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/$NDK/build/cmake/android.toolchain.cmake \
32-
-DANDROID_ABI=$ABI \
33-
-DANDROID_PLATFORM=android-$API \
34-
-DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DCMAKE_BUILD_TYPE=Release
35-
36-
cmake --build . --verbose
29+
cmake -B _build \
30+
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/$NDK/build/cmake/android.toolchain.cmake \
31+
-DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON \
32+
-DANDROID_ABI=$ABI -DANDROID_PLATFORM=android-$API \
33+
-DCMAKE_BUILD_TYPE=Release
34+
cmake --build _build --verbose

‎.github/workflows/benchmark.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v3
11-
- name: Install dependencies
12-
run: |
13-
sudo apt install g++
1411
- name: Setup
15-
run: |
16-
mkdir _build
17-
cd _build && cmake .. -DBUILD_BENCHMARK=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release
12+
run: cmake -B _build -DBUILD_BENCHMARK=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release
1813
- name: Build
1914
run: cmake --build _build
2015
- name: Testing sequential

‎.github/workflows/cmake.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ jobs:
1313
- name: Checkout xsimd
1414
uses: actions/checkout@v3
1515
- name: Configure build
16-
run: |
17-
mkdir _build && cd _build
18-
cmake .. -DCMAKE_BUILD_TYPE=Release \
19-
-DCMAKE_INSTALL_PREFIX=_install
16+
run: cmake -B _build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=_install
2017
- name: Build
2118
run: cmake --build _build --target install
2219
- name: Check install
2320
run: |
2421
mkdir _install_build && cd _install_build
2522
cp ${{ github.workspace }}/.github/cmake-test/* .
26-
ls $PWD/../_build/_install/share/cmake/xsimd
27-
cmake . -DCMAKE_PREFIX_PATH=$PWD/../_build/_install/share/cmake/xsimd
23+
ls $PWD/../_install/share/cmake/xsimd
24+
cmake . -DCMAKE_PREFIX_PATH=$PWD/../_install/share/cmake/xsimd
2825
cmake --build .
2926

‎.github/workflows/cross-arm.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ jobs:
3535
uses: actions/checkout@v3
3636
- name: Setup
3737
run: |
38-
mkdir _build
39-
cd _build && cmake .. -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DBUILD_BENCHMARK=${{ matrix.target.full }} -DBUILD_EXAMPLES=${{ matrix.target.full }} -DCMAKE_BUILD_TYPE=Release -DTARGET_ARCH=generic -DCMAKE_C_FLAGS="-march=${{ matrix.target.arch }} ${{ matrix.target.flags }}" -DCMAKE_CXX_FLAGS="-march=${{ matrix.target.arch }} ${{ matrix.target.flags }}" -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/${{ matrix.sys.compiler }}-${{ matrix.target.dir }}.cmake
38+
cmake -B _build \
39+
-DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DBUILD_BENCHMARK=${{ matrix.target.full }} \
40+
-DBUILD_EXAMPLES=${{ matrix.target.full }} -DCMAKE_BUILD_TYPE=Release \
41+
-DTARGET_ARCH=generic \
42+
-DCMAKE_C_FLAGS="-march=${{ matrix.target.arch }} ${{ matrix.target.flags }}" \
43+
-DCMAKE_CXX_FLAGS="-march=${{ matrix.target.arch }} ${{ matrix.target.flags }}" \
44+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/${{ matrix.sys.compiler }}-${{ matrix.target.dir }}.cmake
4045
- name: Build
4146
run: cmake --build _build
4247
- name: Testing xsimd
43-
run: |
44-
qemu-${{ matrix.target.platform }} -L /usr/${{ matrix.target.dir}}/ ./test/test_xsimd
48+
run: qemu-${{ matrix.target.platform }} -L /usr/${{ matrix.target.dir}}/ ./test/test_xsimd
4549
working-directory: ${{ github.workspace }}/_build

‎.github/workflows/cross-ppc.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,15 @@ jobs:
3434
uses: actions/checkout@v3
3535
- name: Setup
3636
run: |
37-
mkdir _build
38-
cd _build && cmake .. -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DBUILD_BENCHMARK=${{ matrix.target.full }} -DBUILD_EXAMPLES=${{ matrix.target.full }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="${{ matrix.target.flags }}" -DCMAKE_CXX_FLAGS="${{ matrix.target.flags }}" -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/${{ matrix.sys.compiler }}-${{ matrix.target.dir }}.cmake
37+
cmake -B _build \
38+
-DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON \
39+
-DBUILD_BENCHMARK=${{ matrix.target.full }} -DBUILD_EXAMPLES=${{ matrix.target.full }} \
40+
-DCMAKE_BUILD_TYPE=Release \
41+
-DCMAKE_C_FLAGS="${{ matrix.target.flags }}" \
42+
-DCMAKE_CXX_FLAGS="${{ matrix.target.flags }}" \
43+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/${{ matrix.sys.compiler }}-${{ matrix.target.dir }}.cmake
3944
- name: Build
4045
run: cmake --build _build --verbose -j1
4146
- name: Testing xsimd
42-
run: |
43-
qemu-${{ matrix.target.platform }} -cpu power10 -L /usr/${{ matrix.target.dir}}/ ./test/test_xsimd
47+
run: qemu-${{ matrix.target.platform }} -cpu power10 -L /usr/${{ matrix.target.dir}}/ ./test/test_xsimd
4448
working-directory: ${{ github.workspace }}/_build

‎.github/workflows/cross-sve.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,16 @@ jobs:
3030
uses: actions/checkout@v3
3131
- name: Setup
3232
run: |
33-
mkdir _build
34-
cd _build && cmake .. -GNinja -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DCMAKE_BUILD_TYPE=Release -DTARGET_ARCH=generic -DCMAKE_C_FLAGS="-march=armv8-a+sve -msve-vector-bits=${{ matrix.vector_bits }}" -DCMAKE_CXX_FLAGS="-march=armv8-a+sve -msve-vector-bits=${{ matrix.vector_bits }}" -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/gcc-aarch64-linux-gnu.cmake
33+
cmake -B _build \
34+
-GNinja \
35+
-DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON \
36+
-DCMAKE_BUILD_TYPE=Release \
37+
-DTARGET_ARCH=generic \
38+
-DCMAKE_C_FLAGS="-march=armv8-a+sve -msve-vector-bits=${{ matrix.vector_bits }}" \
39+
-DCMAKE_CXX_FLAGS="-march=armv8-a+sve -msve-vector-bits=${{ matrix.vector_bits }}" \
40+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/gcc-aarch64-linux-gnu.cmake
3541
- name: Build
3642
run: cmake --build _build
3743
- name: Testing xsimd
38-
run: |
39-
qemu-aarch64 --cpu max,sve${{ matrix.vector_bits }}=on -L /usr/aarch64-linux-gnu/ ./test/test_xsimd
44+
run: qemu-aarch64 --cpu max,sve${{ matrix.vector_bits }}=on -L /usr/aarch64-linux-gnu/ ./test/test_xsimd
4045
working-directory: ${{ github.workspace }}/_build

‎.github/workflows/cxx-no-exceptions.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@v3
8-
- name: Install dependencies
9-
run: |
10-
sudo apt install g++
118
- name: Setup
12-
run: |
13-
mkdir _build
14-
cd _build && cmake .. -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fno-exceptions
9+
run: cmake -B _build -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fno-exceptions
1510
- name: Build
1611
run: cmake --build _build
1712

‎.github/workflows/cxx-versions.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,8 @@ jobs:
1111
cxx-version: [14, 17, 20]
1212
steps:
1313
- uses: actions/checkout@v3
14-
- name: Install dependencies
15-
run: |
16-
sudo apt install g++
1714
- name: Setup
18-
run: |
19-
mkdir _build
20-
cd _build && cmake .. -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{matrix.cxx-version}}
15+
run: cmake -B _build -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{matrix.cxx-version}}
2116
- name: Build
2217
run: cmake --build _build
2318

‎.github/workflows/emulated.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ jobs:
2525
environment-file: environment.yml
2626
- name: Setup GCC compiler
2727
if: ${{ matrix.sys.compiler == 'g++' }}
28-
run: |
29-
echo "CXXFLAGS=-Wno-noexcept-type -Wno-stringop-overflow -Wno-maybe-uninitialized" >> $GITHUB_ENV
28+
run: echo "CXXFLAGS=-Wno-noexcept-type -Wno-stringop-overflow -Wno-maybe-uninitialized" >> $GITHUB_ENV
3029
- name: Configure build
3130
run: |
32-
cmake -B_build \
31+
cmake -B _build \
3332
-DBUILD_TESTS=ON \
3433
-DBUILD_BENCHMARK=ON \
3534
-DBUILD_EXAMPLES=ON \

‎.github/workflows/linux.yml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,21 @@ jobs:
105105
# Cheap way of spotting uninitialized read
106106
CXX_FLAGS="$CXX_FLAGS -ftrivial-auto-var-init=pattern"
107107
108-
mkdir _build
109-
cd _build
110-
cmake .. -DBUILD_TESTS=ON \
111-
-DBUILD_BENCHMARK=ON \
112-
-DBUILD_EXAMPLES=ON \
113-
-DCMAKE_BUILD_TYPE=Release \
114-
-DCMAKE_C_COMPILER=$CC \
115-
-DCMAKE_CXX_COMPILER=$CXX \
116-
$CMAKE_EXTRA_ARGS \
117-
-DCMAKE_CXX_FLAGS='$CXX_FLAGS' \
118-
-G Ninja
108+
cmake -B _build \
109+
-DBUILD_TESTS=ON \
110+
-DBUILD_BENCHMARK=ON \
111+
-DBUILD_EXAMPLES=ON \
112+
-DCMAKE_BUILD_TYPE=Release \
113+
-DCMAKE_C_COMPILER=$CC \
114+
-DCMAKE_CXX_COMPILER=$CXX \
115+
$CMAKE_EXTRA_ARGS \
116+
-DCMAKE_CXX_FLAGS='$CXX_FLAGS' \
117+
-G Ninja
119118
- name: Build
120-
run: ninja -C _build
119+
run: cmake --build _build
121120
- name: Test
122121
run: |
123-
cd _build
124-
cd test
122+
cd _build/test
125123
if echo '${{ matrix.sys.flags }}' | grep -q 'avx512' ; then
126124
../../sde-external-9.48.0-2024-11-25-lin/sde64 -tgl -- ./test_xsimd
127125
else

0 commit comments

Comments
 (0)