Skip to content

Commit c9a673a

Browse files
authored
Merge pull request #38 from wermos/ci
Cleaned up the CI a little.
2 parents 100d0b3 + db8bf63 commit c9a673a

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: CI Tests
55
on:
66
workflow_dispatch:
77
push:
8-
branches: [main]
8+
branches: [main, ci]
99
pull_request:
1010
branches: [main]
1111
jobs:
@@ -26,17 +26,14 @@ jobs:
2626
- {name: "Ubuntu GCC 12", os: ubuntu-24.04, toolchain: "gcc-12", cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
with:
3131
submodules: 'true'
32-
- uses: seanmiddleditch/gha-setup-ninja@master
3332
- name: Activate verbose shell
3433
run: set -x
3534
- name: Install LLVM+Clang
3635
if: startsWith(matrix.config.name, 'Ubuntu Clang')
3736
run: |
38-
set -x
39-
cat /etc/lsb-release
4037
# Remove existing Clang installations.
4138
sudo apt-get remove \
4239
clang-${{matrix.config.installed_clang_version}} \
@@ -71,7 +68,6 @@ jobs:
7168
- name: Install GCC
7269
if: startsWith(matrix.config.name, 'Ubuntu GCC')
7370
run: |
74-
set -x
7571
# Remove existing GCC installations.
7672
sudo apt-get remove gcc-13 g++-13 gcc-14 g++-14 gcc g++
7773
sudo apt update
@@ -83,17 +79,13 @@ jobs:
8379
g++-${GCC_VERSION} --version
8480
- name: CMake Configure
8581
run: |
86-
set -x
8782
echo ${{ matrix.config.cmake_args }}
8883
echo ${{ matrix.config.toolchain }}
89-
rm -rf .build
9084
cmake ${{ matrix.config.cmake_args }} -DCMAKE_TOOLCHAIN_FILE="etc/${{ matrix.config.toolchain }}-toolchain.cmake" -B .build -S .
9185
- name: CMake Build
9286
run: |
93-
set -x
9487
cmake --build .build --config Asan --target all -- -k 0
9588
- name: CMake Test
9689
run: |
97-
set -x
9890
[[ ! -z "${{ matrix.config.asan_options }}" ]] && export ASAN_OPTIONS="${{ matrix.config.asan_options }}"
9991
ctest --build-config Asan --output-on-failure --test-dir .build

0 commit comments

Comments
 (0)