Skip to content

OSX CI Fixes #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2024
Merged

OSX CI Fixes #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,40 @@ osx_m1_task:
matrix:
env:
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: no
env:
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: hwloc
env:
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: binders
env:
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: no
env:
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: hwloc
env:
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: binders
env:
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: no
env:
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: hwloc
env:
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: binders
install_deps_script: |
brew install autoconf automake libtool coreutils # coreutils is to get gtimeout for CI and is not universally required by qthreads.
if [ "$QTHREADS_TOPOLOGY" != "no" ]; then brew install hwloc; fi
build_script: |
export CFLAGS="-I$(brew --prefix)/include $CFLAGS"
export CXXFLAGS="-I$(brew --prefix)/include $CXXFLAGS"
export LDFLAGS="-L$(brew --prefix)/lib $LDFLAGS"
./autogen.sh
./configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=no
./configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=$QTHREADS_TOPOLOGY
make -j$CIRRUS_CPU
test_script: |
gtimeout --foreground 3m make check
Expand Down Expand Up @@ -51,18 +76,27 @@ arm_linux_task:
env:
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: hwloc
env:
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: binders
env:
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: no
env:
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: hwloc
env:
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: binders
env:
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: no
env:
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: hwloc
env:
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: binders
install_deps_script: |
apt-get update -y
apt-get install -y autoconf automake libtool
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ jobs:
hwloc-ls --version
- name: build qthreads
run: |
export CFLAGS="-I$(brew --prefix)/include $CFLAGS"
export CXXFLAGS="-I$(brew --prefix)/include $CXXFLAGS"
export LDFLAGS="-L$(brew --prefix)/lib $LDFLAGS"
./autogen.sh
./configure $QTHREADS_ENABLE_ASSERTS --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }}
make -j3
Expand Down
Loading