Skip to content

Commit 312d00c

Browse files
authored
Merge branch 'development' into new_shock_flag_call
2 parents 89e58ce + 49dcb5a commit 312d00c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+493
-347
lines changed

.clang-tidy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Checks: >
1313
-cppcoreguidelines-init-variables,
1414
-cppcoreguidelines-interfaces-global-init,
1515
-cppcoreguidelines-macro-usage,
16-
-cppcoreguidelines-no-malloc,
1716
-cppcoreguidelines-non-private-member-variables-in-classes,
1817
-cppcoreguidelines-owning-memory,
1918
-cppcoreguidelines-pro-*,
@@ -25,7 +24,6 @@ Checks: >
2524
modernize-*,
2625
-modernize-avoid-c-arrays,
2726
-modernize-use-trailing-return-type,
28-
-modernize-use-using,
2927
performance-*,
3028
-performance-avoid-endl,
3129
portability-*,

.github/workflows/c-linter.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: cpp-linter
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
59
jobs:
610
cpp-linter:
711
runs-on: ubuntu-latest

.github/workflows/check_pr_branch.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: check PR branch
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
- edited
10+
11+
jobs:
12+
check-PR-branch:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: PRs should not target main
16+
run: |
17+
if [[ "${{ github.base_ref }}" == "main" ]]; then
18+
echo 'Pull requests must not be made against main. Please target development instead.'
19+
exit 1
20+
fi

.github/workflows/clang-tidy.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: "clang-tidy"
2+
3+
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
clang_tidy:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Get submodules
16+
run: |
17+
git submodule update --init
18+
cd external/Microphysics
19+
git fetch; git checkout development
20+
echo "MICROPHYSICS_HOME=$(pwd)" >> $GITHUB_ENV
21+
cd ../amrex
22+
git fetch; git checkout development
23+
echo "AMREX_HOME=$(pwd)" >> $GITHUB_ENV
24+
cd ../..
25+
26+
- name: Install dependencies
27+
run: |
28+
.github/workflows/dependencies_clang-tidy-apt-llvm.sh 17
29+
30+
- name: Compile flame_wave
31+
run: |
32+
echo $AMREX_HOME
33+
echo $MICROPHYSICS_HOME
34+
cd Exec/science/subchandra
35+
make USE_MPI=FALSE USE_CLANG_TIDY=TRUE CLANG_TIDY=clang-tidy-17 CLANG_TIDY_WARN_ERROR=TRUE -j 4
36+

.github/workflows/compiler-warnings.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: "compiler warnings"
22

33
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
49
jobs:
510
compiler_warnings:
611
runs-on: ubuntu-latest
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
set -eu -o pipefail
4+
5+
# `man apt.conf`:
6+
# Number of retries to perform. If this is non-zero APT will retry
7+
# failed files the given number of times.
8+
echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries
9+
10+
if [[ ! -f /etc/apt/trusted.gpg.d/apt.llvm.org.asc ]]; then
11+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
12+
fi
13+
14+
source /etc/os-release # set UBUNTU_CODENAME
15+
16+
sudo add-apt-repository "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME} main"
17+
sudo add-apt-repository "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-$1 main"
18+
19+
sudo apt-get update
20+
21+
sudo apt-get install -y --no-install-recommends \
22+
clang-tidy-$1 libomp-$1-dev

.github/workflows/detonation-sdc-compare.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: detonation-sdc
22

33
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
49
jobs:
510
detonation-sdc:
611
runs-on: ubuntu-latest

.github/workflows/flame_wave-compare.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: flame_wave
22

33
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
49
jobs:
510
flame_wave-2d:
611
runs-on: ubuntu-latest

.github/workflows/gpu_action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: GPU compilation
22

33
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
49
jobs:
510
gpu-compilation:
611
runs-on: ubuntu-latest

.github/workflows/wdmerger_collision-compare.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: wdmerger_collision
22

33
on: [pull_request]
4+
5+
concurrency:
6+
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
7+
cancel-in-progress: true
8+
49
jobs:
510
wdmerger_collision-2d:
611
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)