Skip to content

Commit 12c4be1

Browse files
authored
Merge pull request #49 from UCBoulder/dev
Release: 0.8.8
2 parents f47f760 + 9a5e5bf commit 12c4be1

26 files changed

Lines changed: 3803 additions & 4370 deletions

‎.clang-format‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
BasedOnStyle: "Google"
2+
3+
AlignAfterOpenBracket: Align
4+
AlignArrayOfStructures: Left
5+
AlignConsecutiveAssignments: AcrossComments
6+
AlignConsecutiveDeclarations: Consecutive
7+
AlignEscapedNewlines: true
8+
AlignOperands: Align
9+
AlignTrailingComments: true
10+
AllowShortIfStatementsOnASingleLine: AllIfsAndElse
11+
ColumnLimit: 120
12+
PenaltyBreakOpenParenthesis: 100
13+
CommentPragmas: 'TESTARGS'
14+
TabWidth: 4
15+
IndentWidth: 4
16+
UseTab: Never
17+
NamespaceIndentation: All
18+
PointerAlignment: Right

‎.clang-tidy‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Checks: "clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-optin.performance.Padding,readability-inconsistent-declaration-parameter-name"
2+
HeaderFilterRegex: .*
3+
WarningsAsErrors: "clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-optin.performance.Padding,readability-inconsistent-declaration-parameter-name"

‎.gersemirc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
line_length: 120
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Test conda-recipe on pull request
2+
run-name: ${{ github.actor }} is testing the conda-recipe on a pull request
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
branches:
10+
- dev
11+
- main
12+
jobs:
13+
build:
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
18+
fail-fast: false
19+
matrix:
20+
os: [ubuntu-latest, macos-latest]
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
- name: MiniConda setup
27+
uses: conda-incubator/setup-miniconda@v2
28+
with:
29+
miniforge-variant: Miniforge3
30+
channels: conda-forge
31+
channel-priority: true
32+
auto-activate-base: false
33+
activate-environment: "test-environment"
34+
- name: Conda environment
35+
shell: bash -el {0}
36+
run: conda install --file conda-build.txt --yes --channel conda-forge
37+
- name: Conda-Build
38+
shell: bash -el {0}
39+
run: conda mambabuild recipe --channel conda-forge --no-anaconda-upload

‎.github/workflows/github-test.yml‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ jobs:
1717
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-latest]
20+
os: [ubuntu-latest, macos-latest]
2121
build_type: [Release]
22+
header_only: [OFF, ON]
23+
tardigrade_opt: [OFF, ON]
2224
steps:
2325
- name: Checkout
2426
uses: actions/checkout@v4
@@ -32,31 +34,27 @@ jobs:
3234
channel-priority: true
3335
auto-activate-base: false
3436
activate-environment: "test-environment"
35-
- name: check solution
36-
run: |
37-
conda env export
38-
- name: Set reusable strings
39-
id: strings
40-
shell: bash
41-
run: |
42-
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
43-
echo "environment-file=${{ github.workspace }}/reduced_environment.txt" >> "$GITHUB_OUTPUT"
44-
echo "moose-dir=${{ github.workspace }}/moose-dir" >> "$GITHUB_OUTPUT"
4537
- name: Conda environment
4638
shell: bash -el {0}
47-
run: |
48-
mamba install --file ${{ steps.strings.outputs.environment-file }} --yes --channel conda-forge
39+
run: conda install --file environment.txt --yes --channel conda-forge
40+
- name: CMake linter
41+
if: ${{ matrix.os == 'ubuntu-latest' }}
42+
shell: bash -el {0}
43+
run: gersemi CMakeLists.txt src/ docs/ --check --diff
44+
- name: Configure
45+
shell: bash -el {0}
46+
run: cmake -S . -B build -DTARDIGRADE_HEADER_ONLY=${{ matrix.header_only }} -DTARDIGRADE_ERROR_TOOLS_OPT=${{ matrix.tardigrade_opt }} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
47+
- name: clang-tidy Lint
48+
if: ${{ matrix.os == 'ubuntu-latest'}}
49+
shell: bash -el {0}
50+
run: run-clang-tidy -config-file=.clang-tidy -header-filter=*.h -p build -extra-arg="-mno-sse2"
51+
- name: clang-format Lint
52+
if: ${{ matrix.os == 'ubuntu-latest' && matrix.tardigrade_opt == 'OFF' && matrix.header_only == 'ON' }}
53+
shell: bash -el {0}
54+
run: cmake --build build --target cpp-format-check
4955
- name: Build
5056
shell: bash -el {0}
51-
run: |
52-
mkdir build
53-
cd build
54-
cmake .. -DTARDIGRADE_ERROR_TOOLS_BUILD_PYTHON_BINDINGS=OFF
55-
make
57+
run: cmake --build build --target all
5658
- name: Test
5759
shell: bash -el {0}
58-
# working-directory: ${{ steps.strings.outputs.build-output-dir }}
59-
run: |
60-
conda activate test-environment
61-
cd build
62-
ctest
60+
run: conda activate test-environment && ctest --test-dir build -V

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 228 deletions
This file was deleted.

0 commit comments

Comments
 (0)