Skip to content

Commit

Permalink
CI: Minor update, workaround actions/runner-images#9491 (#28)
Browse files Browse the repository at this point in the history
* Fail-fast false, add gcc-9 and clang-13

* meson_options.txt: Add single quotes around boolean values

* Modify concurrency

These weird issues are probably related to
actions/runner-images#9524

* Configure meson with sanitize

This was removed from the default options in
abb9da2
  • Loading branch information
andy5995 committed Mar 18, 2024
1 parent abb9da2 commit f68a625
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ freebsd13_task:
- pkg install -y meson ninja

setup_script:
- meson setup _build
- meson setup _build -Db_sanitize=address,undefined -Db_lundef=false
build_script:
- cd _build && ninja -v
test_script:
Expand All @@ -35,7 +35,7 @@ freebsd14_task:
- pkg install -y meson ninja

setup_script:
- meson setup _build
- meson setup _build -Db_sanitize=address,undefined -Db_lundef=false
build_script:
- cd _build && ninja -v
test_script:
Expand All @@ -50,7 +50,7 @@ macos_task:
- brew update
- brew install meson ninja
setup_script:
- meson setup _build
- meson setup _build -Db_sanitize=address,undefined -Db_lundef=false
build_script:
- cd _build && ninja
test_script:
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: C/C++ CI
concurrency:
group: build-${{ github.ref }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true

on:
Expand All @@ -24,20 +24,31 @@ on:
jobs:
linux:
strategy:
fail-fast: false
matrix:
cc: [gcc, clang]
cc: [gcc-9, gcc-11, clang-13, clang-14]
runs-on: ubuntu-latest
env:
CC: ${{ matrix.cc }}
steps:
- uses: actions/checkout@v4

- name: Fix kernel mmap rnd bits
# Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
# high-entropy ASLR in much newer kernels that GitHub runners are
# using leading to random crashes: https://reviews.llvm.org/D148280
run: sudo sysctl vm.mmap_rnd_bits=28

- name: Install dependencies
run: sudo apt update && sudo apt-get install -y meson $CC
run: |
# sudo apt remove -y firefox
sudo apt update
# sudo apt upgrade -y
sudo apt install -y meson ninja-build $CC
- name: Build
run: |
meson setup _build
meson setup _build -Db_sanitize=address,undefined -Db_lundef=false
cd _build
ninja
- name: Test
Expand All @@ -49,7 +60,7 @@ jobs:
- uses: actions/checkout@v4
- run: brew install meson
- run: |
meson setup _build
meson setup _build -Db_sanitize=address,undefined -Db_lundef=false
cd _build
ninja
meson test -v
4 changes: 2 additions & 2 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ option(
option(
'build_tests',
type : 'boolean',
value : true,
value : 'true',
description : 'Build tests'
)
option(
'build_examples',
type : 'boolean',
value : true,
value : 'true',
description : 'Build examples'
)

0 comments on commit f68a625

Please sign in to comment.