Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,19 @@ on:
jobs:
main:

runs-on: ubuntu-latest
strategy:
matrix:
include:
- os: ubuntu-latest
conda_env_file: dev-linux-64.yaml
- os: macos-latest
conda_env_file: dev-osx-64.yaml

runs-on: ${{ matrix.os }}
timeout-minutes: 20

concurrency:
group: ci-main-${{ github.ref }}
group: ci-${{ matrix.os }}-main-${{ github.ref }}
cancel-in-progress: true

defaults:
Expand All @@ -37,11 +45,16 @@ jobs:
channels: conda-forge,nodefaults
channel-priority: true
activate-environment: arx
environment-file: conda/dev-linux-64.yaml
environment-file: conda/${{ matrix.conda_env_file }}

- name: build
- name: Build on Linux
if: ${{ matrix.os == 'ubuntu-latest' }}
run: make build-dev CLEAN=1

- name: Build on OSX
if: ${{ matrix.os == 'macos-latest' }}
run: make build-dev CLEAN=1 CC=clang-cl

- name: test flags
run: |
build/arx --version
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# build
CLEAN=0
CXX=clang++
CC=clang
CXX:=clang++
CC:=clang

ARGS:=

Expand Down
1 change: 0 additions & 1 deletion conda/dev-linux-64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ dependencies:
- gdb
- glib
- libclang-cpp 15.*
# - libcxx 15.*
- libstdcxx-devel_linux-64
- libstdcxx-ng
- lld 15.*
Expand Down
40 changes: 40 additions & 0 deletions conda/dev-osx-64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: arx
channels:
- nodefaults
- conda-forge
dependencies:
# build
- clangdev 14.*
- clangxx 14.*
- cmake
- compiler-rt 14.*
- compilers
# it would be nice to replace that by lldb, but
# the latest version on conda-forge is very old.
- gdb
- glib
- libclang-cpp 14.*
- lld 14.*
- llvmdev 14.*
- make
- meson
- ninja
- pkg-config
# run
- arrow-c-glib 10.*
- arrow-cpp 10.*
- cli11
- glog
# dev
- cppcheck
- docker-compose
- doxygen
- gmock
- gtest
# - include-what-you-use >=0.18
- jupyterlab
- lcov
- mkdocs
- mkdocs-jupyter
- nodejs
- pre-commit
15 changes: 14 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,22 @@ PROJECT_PATH = meson.source_root()

cxx = meson.get_compiler('cpp')

r = run_command('echo', '$OSTYPE', check: true)
operating_system = r.stdout().strip()

# note: probably not a good approach but we should have both
# OS with the same pinning soon

if 'Linux' in operating_system
llvm_version = '>=15.0.0'
else
# osx
llvm_version = '>=14.0.0'
endif

deps = [
dependency('arrow'),
dependency('llvm', version : '>=14.0.0'),
dependency('llvm', version : llvm_version),
dependency('CLI11'),
dependency('threads'),
dependency('glog'),
Expand Down