Skip to content

Commit 0144d7e

Browse files
authored
Merge pull request #2 from hpc4cmb/build_updates
Update build system
2 parents 94d8127 + 9b41d89 commit 0144d7e

File tree

4 files changed

+82
-98
lines changed

4 files changed

+82
-98
lines changed

.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Please see the documentation for all configuration options:
2+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
interval: "weekly"

.github/workflows/test.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Test that we can build on Linux and MacOS with the conda-forge toolchain
2+
3+
name: Test Compilation
4+
5+
on:
6+
push:
7+
branches:
8+
- master
9+
pull_request:
10+
branches:
11+
- master
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
test:
19+
name: Compile on ${{ matrix.arch }}
20+
runs-on: ${{ matrix.os }}
21+
defaults:
22+
run:
23+
shell: bash -l {0}
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
include:
28+
- os: ubuntu-latest
29+
arch: Linux-x86_64
30+
- os: macos-latest
31+
arch: MacOSX-x86_64
32+
- os: macos-latest
33+
arch: MacOSX-arm64
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v4
37+
38+
- name: Setup Conda Base
39+
run: |
40+
sudo rm -rf /usr/share/miniconda \
41+
&& sudo rm -rf /usr/local/miniconda \
42+
&& curl -SL -o miniforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-${{ matrix.arch }}.sh \
43+
&& bash miniforge.sh -b -f -p ~/conda \
44+
&& source ~/conda/etc/profile.d/conda.sh \
45+
&& conda activate base \
46+
&& conda update -n base --yes conda
47+
48+
- name: Check Conda Config
49+
run: |
50+
source ~/conda/etc/profile.d/conda.sh \
51+
&& conda activate base \
52+
&& conda info \
53+
&& conda list \
54+
&& conda config --show-sources \
55+
&& conda config --show
56+
57+
- name: Install Dependencies
58+
run: |
59+
source ~/conda/etc/profile.d/conda.sh \
60+
&& conda create --yes -n test cmake compilers
61+
62+
- name: Install
63+
run: |
64+
source ~/conda/etc/profile.d/conda.sh \
65+
&& conda activate test \
66+
&& mkdir -p build \
67+
&& pushd build >/dev/null 2>&1 \
68+
&& cmake -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} .. \
69+
&& make -j 2 install
70+

.travis.yml

-85
This file was deleted.

CMakeLists.txt

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
# libaatm
22

3-
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
4-
5-
# foreach(policy
6-
# CMP0048
7-
# CMP0074
8-
# CMP0077
9-
# )
10-
# if(POLICY ${policy})
11-
# cmake_policy(SET ${policy} NEW)
12-
# endif()
13-
# endforeach()
14-
15-
project(libaatm VERSION 1.0.0 LANGUAGES C CXX)
3+
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
4+
5+
project(libaatm VERSION 1.1.0 LANGUAGES C CXX)
166

177
# Auxiliary files
188
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

0 commit comments

Comments
 (0)