From 6118fc2525ecd5cd46f7d59b0d43de8f0974bd5e Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Tue, 12 Aug 2025 22:21:26 -0600 Subject: [PATCH 01/24] Add clang-tidy test for LMeX --- .github/workflows/downstream.yml | 127 +++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 .github/workflows/downstream.yml diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml new file mode 100644 index 000000000..2b1383e3a --- /dev/null +++ b/.github/workflows/downstream.yml @@ -0,0 +1,127 @@ +name: Downstream CI (PeleLMeX clang-tidy) + +on: + workflow_dispatch: + push: + branches: [development] + pull_request: + branches: [development] + +jobs: + PeleLMeX-clang-tidy: + name: PeleLMeX clang-tidy + runs-on: ubuntu-24.04 + strategy: + matrix: + enable_eb: [EB-OFF, EB-ON] + include: + - enable_eb: EB-OFF + use_eb: "OFF" + - enable_eb: EB-ON + use_eb: "ON" + fail-fast: false + + env: + BUILD_DIR: ${{ runner.workspace }}/build-clang-tidy + + steps: + - name: Checkout PelePhysics + uses: actions/checkout@v4 + with: + path: pelephysics-pr + fetch-depth: 0 + + - name: Clone PeleLMeX + run: | + git clone --recursive --shallow-submodules --single-branch \ + https://github.com/AMReX-Combustion/PeleLMeX.git + + - name: Point PeleLMeX/Submodules/PelePhysics to this PR + working-directory: PeleLMeX + shell: bash + run: | + PR_ABS="$(cd "${GITHUB_WORKSPACE}/pelephysics-pr" && pwd)" + git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://${PR_ABS}" + git submodule sync -- Submodules/PelePhysics + # Re-init that single submodule from the PR checkout + git submodule update --init --recursive --depth 1 -- Submodules/PelePhysics + # Init the rest (stays shallow) + git submodule update --init --recursive --depth 1 + echo "PeleLMeX/Submodules/PelePhysics -> $(git -C Submodules/PelePhysics rev-parse --short HEAD)" + echo "PR checkout -> $(git -C "${PR_ABS}" rev-parse --short HEAD)" + + - name: Setup + run: | + echo "NPROCS=$(nproc)" >> $GITHUB_ENV + echo "CCACHE_COMPRESS=1" >> $GITHUB_ENV + echo "CCACHE_COMPRESSLEVEL=10" >> $GITHUB_ENV + echo "CCACHE_LOGFILE=${{github.workspace}}/ccache.log.txt" >> $GITHUB_ENV + # Point to PeleLMeX's .clang-tidy (workspace here is PelePhysics) + echo "CCACHE_EXTRAFILES=${{github.workspace}}/PeleLMeX/.clang-tidy" >> $GITHUB_ENV + echo "CCACHE_MAXSIZE=100M" >> $GITHUB_ENV + echo "CTCACHE_DIR=~/.cache/ctcache" >> $GITHUB_ENV + + - name: Install ccache & clang-tidy cache wrapper + run: | + sudo apt-get update + sudo apt-get install -y xz-utils curl clang clang++ cmake + wget https://github.com/ccache/ccache/releases/download/v4.8/ccache-4.8-linux-x86_64.tar.xz + sudo curl https://raw.githubusercontent.com/matus-chochlik/ctcache/7fd516e91c17779cbc6fc18bd119313d9532dd90/clang-tidy-cache -Lo /usr/bin/clang-tidy-cache + tar xvf ccache-4.8-linux-x86_64.tar.xz + sudo cp -f ccache-4.8-linux-x86_64/ccache /usr/local/bin/ + sudo chmod +x /usr/bin/clang-tidy-cache + mkdir -p ~/.cache/ctcache + + - name: Cache (ccache & ctcache) + uses: actions/cache@v4 + with: + path: ~/.cache + key: ccache-${{ github.workflow }}-${{ github.job }}-${{ matrix.enable_eb }}-git-${{ github.sha }} + restore-keys: | + ccache-${{ github.workflow }}-${{ github.job }}-${{ matrix.enable_eb }}-git- + + - name: Configure + working-directory: PeleLMeX + run: | + cmake -B"${BUILD_DIR}" \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DCMAKE_CXX_COMPILER:STRING=clang++ \ + -DCMAKE_C_COMPILER:STRING=clang \ + -DPELE_ENABLE_EB:BOOL=${{ matrix.use_eb }} \ + -DPELE_ENABLE_MPI:BOOL=OFF \ + -DPELE_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \ + -DPELE_ENABLE_CLANG_TIDY:BOOL=ON \ + -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache \ + ${{ github.workspace }}/PeleLMeX + + - name: Check (build to run clang-tidy) + working-directory: ${{ env.BUILD_DIR }} + run: | + cmake --build . --parallel ${{ env.NPROCS }} 2>&1 | tee -a clang-tidy-full-report.txt + egrep "Warning:|Error:|warning:|error:" clang-tidy-full-report.txt \ + | egrep -v "Submodules/amrex|Submodules/sundials|Submodules/AMReX-Hydro" \ + | egrep -v "ld: warning:" | sort | uniq \ + | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > clang-tidy-warnings.txt + + - name: Ccache Report + run: | + ls ~/.cache || true + ls ~/.cache/ccache || true + du -hs ~/.cache/ccache || true + ls ~/.cache/ctcache || true + du -hs ~/.cache/ctcache || true + ccache -s || true + + - name: Full report + working-directory: ${{ env.BUILD_DIR }} + run: cat clang-tidy-full-report.txt + + - name: Short report (fail on warnings) + working-directory: ${{ env.BUILD_DIR }} + run: | + # Use absolute matcher path since we're not at repo root + echo "::add-matcher::${{ github.workspace }}/PeleLMeX/.github/problem-matchers/gcc.json" + cat clang-tidy-warnings.txt + export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') + exit ${return} From f4f77c1183f7b1f2234c6cca1e02e6cd0acf751b Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Tue, 12 Aug 2025 22:32:12 -0600 Subject: [PATCH 02/24] Remove 'on push' --- .github/workflows/downstream.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 2b1383e3a..6f6b170fc 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -1,9 +1,6 @@ name: Downstream CI (PeleLMeX clang-tidy) on: - workflow_dispatch: - push: - branches: [development] pull_request: branches: [development] From 0b194940a90e77b455db6b5f811814d16acd3fde Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Tue, 12 Aug 2025 23:07:50 -0600 Subject: [PATCH 03/24] switch to pull_request_target for now --- .github/workflows/downstream.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 6f6b170fc..c57594d47 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -1,7 +1,8 @@ name: Downstream CI (PeleLMeX clang-tidy) on: - pull_request: + workflow_dispatch: + pull_request_target: branches: [development] jobs: From 0dce9286028560313039d00fc055ba175147805e Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 11:34:26 -0600 Subject: [PATCH 04/24] test in fork --- .github/workflows/downstream.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index c57594d47..9188a72a6 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -2,7 +2,10 @@ name: Downstream CI (PeleLMeX clang-tidy) on: workflow_dispatch: - pull_request_target: + push: + branches: + - '**' + pull_request: branches: [development] jobs: From d9fc205e87eb82b86536633f761b248183173210 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 11:42:05 -0600 Subject: [PATCH 05/24] Fix build dir --- .github/workflows/downstream.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 9188a72a6..8e778a6d0 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -1,9 +1,9 @@ -name: Downstream CI (PeleLMeX clang-tidy) +name: Downstream-CI on: workflow_dispatch: push: - branches: + branches: - '**' pull_request: branches: [development] @@ -23,7 +23,7 @@ jobs: fail-fast: false env: - BUILD_DIR: ${{ runner.workspace }}/build-clang-tidy + BUILD_DIR: ${{ github.workspace }}/build-clang-tidy steps: - name: Checkout PelePhysics @@ -42,6 +42,7 @@ jobs: shell: bash run: | PR_ABS="$(cd "${GITHUB_WORKSPACE}/pelephysics-pr" && pwd)" + git config --global protocol.file.allow always # allow file:// remote git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://${PR_ABS}" git submodule sync -- Submodules/PelePhysics # Re-init that single submodule from the PR checkout @@ -57,7 +58,6 @@ jobs: echo "CCACHE_COMPRESS=1" >> $GITHUB_ENV echo "CCACHE_COMPRESSLEVEL=10" >> $GITHUB_ENV echo "CCACHE_LOGFILE=${{github.workspace}}/ccache.log.txt" >> $GITHUB_ENV - # Point to PeleLMeX's .clang-tidy (workspace here is PelePhysics) echo "CCACHE_EXTRAFILES=${{github.workspace}}/PeleLMeX/.clang-tidy" >> $GITHUB_ENV echo "CCACHE_MAXSIZE=100M" >> $GITHUB_ENV echo "CTCACHE_DIR=~/.cache/ctcache" >> $GITHUB_ENV @@ -121,7 +121,6 @@ jobs: - name: Short report (fail on warnings) working-directory: ${{ env.BUILD_DIR }} run: | - # Use absolute matcher path since we're not at repo root echo "::add-matcher::${{ github.workspace }}/PeleLMeX/.github/problem-matchers/gcc.json" cat clang-tidy-warnings.txt export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') From 2d12a6c29b981d7ddf97cd4997f3a0939f5dc960 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 12:55:12 -0600 Subject: [PATCH 06/24] Update clang-tidy --- .github/workflows/downstream.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 8e778a6d0..98c4df01a 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -62,10 +62,8 @@ jobs: echo "CCACHE_MAXSIZE=100M" >> $GITHUB_ENV echo "CTCACHE_DIR=~/.cache/ctcache" >> $GITHUB_ENV - - name: Install ccache & clang-tidy cache wrapper + - name: Install Ccache run: | - sudo apt-get update - sudo apt-get install -y xz-utils curl clang clang++ cmake wget https://github.com/ccache/ccache/releases/download/v4.8/ccache-4.8-linux-x86_64.tar.xz sudo curl https://raw.githubusercontent.com/matus-chochlik/ctcache/7fd516e91c17779cbc6fc18bd119313d9532dd90/clang-tidy-cache -Lo /usr/bin/clang-tidy-cache tar xvf ccache-4.8-linux-x86_64.tar.xz @@ -73,7 +71,7 @@ jobs: sudo chmod +x /usr/bin/clang-tidy-cache mkdir -p ~/.cache/ctcache - - name: Cache (ccache & ctcache) + - name: Set Up Ccache uses: actions/cache@v4 with: path: ~/.cache @@ -96,7 +94,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache \ ${{ github.workspace }}/PeleLMeX - - name: Check (build to run clang-tidy) + - name: Check working-directory: ${{ env.BUILD_DIR }} run: | cmake --build . --parallel ${{ env.NPROCS }} 2>&1 | tee -a clang-tidy-full-report.txt @@ -107,18 +105,18 @@ jobs: - name: Ccache Report run: | - ls ~/.cache || true - ls ~/.cache/ccache || true - du -hs ~/.cache/ccache || true - ls ~/.cache/ctcache || true - du -hs ~/.cache/ctcache || true - ccache -s || true + ls ~/.cache + ls ~/.cache/ccache + du -hs ~/.cache/ccache + ls ~/.cache/ctcache + du -hs ~/.cache/ctcache + ccache -s - name: Full report working-directory: ${{ env.BUILD_DIR }} run: cat clang-tidy-full-report.txt - - name: Short report (fail on warnings) + - name: Short report working-directory: ${{ env.BUILD_DIR }} run: | echo "::add-matcher::${{ github.workspace }}/PeleLMeX/.github/problem-matchers/gcc.json" From aab8c9e8098a30b4cd6dcc9306b5ed4fc8e71743 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 14:02:33 -0600 Subject: [PATCH 07/24] Simplify pointing to PP PR --- .github/workflows/downstream.yml | 41 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 98c4df01a..42de25e26 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false env: - BUILD_DIR: ${{ github.workspace }}/build-clang-tidy + BUILD_DIR: ${{ github.workspace }}/build-clang-tidy-lmex steps: - name: Checkout PelePhysics @@ -41,16 +41,16 @@ jobs: working-directory: PeleLMeX shell: bash run: | - PR_ABS="$(cd "${GITHUB_WORKSPACE}/pelephysics-pr" && pwd)" - git config --global protocol.file.allow always # allow file:// remote - git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://${PR_ABS}" + # Allow use of file:// remotes for submodules + git config --global protocol.file.allow always + + # Point the submodule to the checked-out PR + git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://$GITHUB_WORKSPACE/pelephysics-pr" git submodule sync -- Submodules/PelePhysics - # Re-init that single submodule from the PR checkout - git submodule update --init --recursive --depth 1 -- Submodules/PelePhysics - # Init the rest (stays shallow) - git submodule update --init --recursive --depth 1 - echo "PeleLMeX/Submodules/PelePhysics -> $(git -C Submodules/PelePhysics rev-parse --short HEAD)" - echo "PR checkout -> $(git -C "${PR_ABS}" rev-parse --short HEAD)" + git submodule update --init --depth 1 -- Submodules/PelePhysics + + echo "Submodule now points to:" + git -C Submodules/PelePhysics rev-parse --short HEAD - name: Setup run: | @@ -83,16 +83,16 @@ jobs: working-directory: PeleLMeX run: | cmake -B"${BUILD_DIR}" \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_CXX_COMPILER:STRING=clang++ \ - -DCMAKE_C_COMPILER:STRING=clang \ - -DPELE_ENABLE_EB:BOOL=${{ matrix.use_eb }} \ - -DPELE_ENABLE_MPI:BOOL=OFF \ - -DPELE_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \ - -DPELE_ENABLE_CLANG_TIDY:BOOL=ON \ - -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache \ - ${{ github.workspace }}/PeleLMeX + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DCMAKE_CXX_COMPILER:STRING=clang++ \ + -DCMAKE_C_COMPILER:STRING=clang \ + -DPELE_ENABLE_EB:BOOL=${{ matrix.use_eb }} \ + -DPELE_ENABLE_MPI:BOOL=OFF \ + -DPELE_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \ + -DPELE_ENABLE_CLANG_TIDY:BOOL=ON \ + -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache \ + ${{ github.workspace }}/PeleLMeX - name: Check working-directory: ${{ env.BUILD_DIR }} @@ -123,3 +123,4 @@ jobs: cat clang-tidy-warnings.txt export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') exit ${return} + From dd8b2dc7d953e8b1f35617532913366f53fe95f8 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 14:03:28 -0600 Subject: [PATCH 08/24] Add PeleC clang-tidy test --- .github/workflows/downstream.yml | 106 +++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 42de25e26..001aed7fc 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -124,3 +124,109 @@ jobs: export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') exit ${return} + PeleC-clang-tidy: + name: PeleC clang-tidy + runs-on: ubuntu-24.04 + + env: + BUILD_DIR: ${{ github.workspace }}/build-clang-tidy-c + + steps: + - name: Checkout PelePhysics + uses: actions/checkout@v4 + with: + path: pelephysics-pr + fetch-depth: 0 + + - name: Clone PeleC + run: | + git clone --recursive --shallow-submodules --single-branch \ + https://github.com/AMReX-Combustion/PeleC + + - name: Point PeleC/Submodules/PelePhysics to this PR + working-directory: PeleC + shell: bash + run: | + # Allow use of file:// remotes for submodules + git config --global protocol.file.allow always + + # Point the submodule to the checked-out PR + git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://$GITHUB_WORKSPACE/pelephysics-pr" + git submodule sync -- Submodules/PelePhysics + git submodule update --init --depth 1 -- Submodules/PelePhysics + + echo "Submodule now points to:" + git -C Submodules/PelePhysics rev-parse --short HEAD + + - name: Setup + run: | + echo "NPROCS=$(nproc)" >> $GITHUB_ENV + echo "CCACHE_COMPRESS=1" >> $GITHUB_ENV + echo "CCACHE_COMPRESSLEVEL=10" >> $GITHUB_ENV + echo "CCACHE_LOGFILE=${{github.workspace}}/ccache.log.txt" >> $GITHUB_ENV + echo "CCACHE_EXTRAFILES=${{github.workspace}}/PeleC/.clang-tidy" >> $GITHUB_ENV + echo "CCACHE_MAXSIZE=100M" >> $GITHUB_ENV + echo "CTCACHE_DIR=~/.cache/ctcache" >> $GITHUB_ENV + + - name: Install Ccache + run: | + wget https://github.com/ccache/ccache/releases/download/v4.8/ccache-4.8-linux-x86_64.tar.xz + sudo curl https://raw.githubusercontent.com/matus-chochlik/ctcache/7fd516e91c17779cbc6fc18bd119313d9532dd90/clang-tidy-cache -Lo /usr/bin/clang-tidy-cache + tar xvf ccache-4.8-linux-x86_64.tar.xz + sudo cp -f ccache-4.8-linux-x86_64/ccache /usr/local/bin/ + sudo chmod +x /usr/bin/clang-tidy-cache + mkdir -p ~/.cache/ctcache + + - name: Set Up Ccache + uses: actions/cache@v4 + with: + path: ~/.cache + key: ccache-${{github.workflow}}-${{github.job}}-git-${{github.sha}} + restore-keys: | + ccache-${{github.workflow}}-${{github.job}}-git- + + - name: Configure + working-directory: PeleC + run: | + cmake -B"${BUILD_DIR}" \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DCMAKE_CXX_COMPILER:STRING=clang++ \ + -DCMAKE_C_COMPILER:STRING=clang \ + -DPELE_ENABLE_MPI:BOOL=OFF \ + -DPELE_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \ + -DPELE_ENABLE_MASA:BOOL=OFF \ + -DPELE_ENABLE_CLANG_TIDY:BOOL=ON \ + -DPELE_EXCLUDE_BUILD_IN_CI:BOOL=ON \ + -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache \ + ${{github.workspace}}/PeleC + + - name: Check + working-directory: ${{ env.BUILD_DIR }} + run: | + cmake --build . --parallel ${{ env.NPROCS }} 2>&1 | tee -a clang-tidy-full-report.txt + egrep "Warning:|Error:|warning:|error:" clang-tidy-full-report.txt \ + | egrep -v "Submodules/amrex|Submodules/sundials|Submodules/AMReX-Hydro" \ + | egrep -v "ld: warning:" | sort | uniq \ + | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > clang-tidy-warnings.txt + + - name: Ccache Report + run: | + ls ~/.cache + ls ~/.cache/ccache + du -hs ~/.cache/ccache + ls ~/.cache/ctcache + du -hs ~/.cache/ctcache + ccache -s + + - name: Full report + working-directory: ${{ env.BUILD_DIR }} + run: cat clang-tidy-full-report.txt + + - name: Short report + working-directory: ${{ env.BUILD_DIR }} + run: | + echo "::add-matcher::${{ github.workspace }}/PeleC/.github/problem-matchers/gcc.json" + cat clang-tidy-warnings.txt + export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') + exit ${return} \ No newline at end of file From f2a6618fae7c713d2604d1dc78ed0094b6b25970 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 14:24:52 -0600 Subject: [PATCH 09/24] Start downstream tests after PelePhysics-CI --- .github/workflows/downstream.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 001aed7fc..802c87da3 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -1,12 +1,10 @@ name: Downstream-CI on: - workflow_dispatch: - push: - branches: - - '**' - pull_request: - branches: [development] + workflow_run: + workflows: ["PelePhysics-CI"] + types: + - completed jobs: PeleLMeX-clang-tidy: From 8f0a9c006d911659d8065b89ec873fc3a7cd3d48 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 14:31:15 -0600 Subject: [PATCH 10/24] add cancel-in-progress to downstream tests --- .github/workflows/downstream.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 802c87da3..f9abcc971 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -6,6 +6,11 @@ on: types: - completed +concurrency: + group: ${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}-downstream + cancel-in-progress: true + + jobs: PeleLMeX-clang-tidy: name: PeleLMeX clang-tidy From de5304d0b3243c7bce8511a7fe9a75068d1a95a0 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 15:03:04 -0600 Subject: [PATCH 11/24] Test concurrency --- .github/workflows/downstream.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index f9abcc971..a054e9b90 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -1,13 +1,15 @@ name: Downstream-CI on: - workflow_run: - workflows: ["PelePhysics-CI"] - types: - - completed + workflow_dispatch: + push: + branches: + - '**' + pull_request: + branches: [development] concurrency: - group: ${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}-downstream + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} cancel-in-progress: true From efc41b48fba6dcd0bf8635fbd612c230abcee83c Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 16:16:40 -0600 Subject: [PATCH 12/24] double check correct SHA for PP PR in LMeX and C --- .github/workflows/downstream.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index a054e9b90..03501ac00 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -36,6 +36,7 @@ jobs: with: path: pelephysics-pr fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Clone PeleLMeX run: | From a7b2883a347113186e9ee9469e9eb792a7796be3 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Thu, 14 Aug 2025 16:27:19 -0600 Subject: [PATCH 13/24] Try again --- .github/workflows/downstream.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 03501ac00..fdedbbd1e 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -47,16 +47,12 @@ jobs: working-directory: PeleLMeX shell: bash run: | - # Allow use of file:// remotes for submodules - git config --global protocol.file.allow always + cd Submodules/PelePhysics + git fetch "$GITHUB_WORKSPACE/pelephysics-pr" + git checkout $(git -C "$GITHUB_WORKSPACE/pelephysics-pr" rev-parse HEAD) - # Point the submodule to the checked-out PR - git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://$GITHUB_WORKSPACE/pelephysics-pr" - git submodule sync -- Submodules/PelePhysics - git submodule update --init --depth 1 -- Submodules/PelePhysics - - echo "Submodule now points to:" - git -C Submodules/PelePhysics rev-parse --short HEAD + echo "PelePhysics Submodule now points to:" + git rev-parse --short HEAD - name: Setup run: | @@ -143,6 +139,7 @@ jobs: with: path: pelephysics-pr fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Clone PeleC run: | @@ -153,16 +150,12 @@ jobs: working-directory: PeleC shell: bash run: | - # Allow use of file:// remotes for submodules - git config --global protocol.file.allow always - - # Point the submodule to the checked-out PR - git config -f .gitmodules submodule.Submodules/PelePhysics.url "file://$GITHUB_WORKSPACE/pelephysics-pr" - git submodule sync -- Submodules/PelePhysics - git submodule update --init --depth 1 -- Submodules/PelePhysics + cd Submodules/PelePhysics + git fetch "$GITHUB_WORKSPACE/pelephysics-pr" + git checkout $(git -C "$GITHUB_WORKSPACE/pelephysics-pr" rev-parse HEAD) - echo "Submodule now points to:" - git -C Submodules/PelePhysics rev-parse --short HEAD + echo "PelePhysics Submodule now points to:" + git rev-parse --short HEAD - name: Setup run: | From b50186635378d11bcbdbd0288c2ec458c0907adf Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 07:47:32 -0600 Subject: [PATCH 14/24] Add RegTests/FlameSheet from LMeX --- .github/workflows/downstream.yml | 49 +++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index fdedbbd1e..a4d2626b5 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -228,4 +228,51 @@ jobs: echo "::add-matcher::${{ github.workspace }}/PeleC/.github/problem-matchers/gcc.json" cat clang-tidy-warnings.txt export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') - exit ${return} \ No newline at end of file + exit ${return} + + PeleLMeX FlameSheet: + name: GNU@9.3 MPI Run [PeleLMeX-FS] + runs-on: ubuntu-latest + env: + {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code"} + + steps: + - name: Checkout PelePhysics + uses: actions/checkout@v4 + with: + path: pelephysics-pr + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha || github.sha }} + + - name: Clone PeleLMeX + run: | + git clone --recursive --shallow-submodules --single-branch \ + https://github.com/AMReX-Combustion/PeleLMeX.git + + - name: Point PeleLMeX/Submodules/PelePhysics to this PR + working-directory: PeleLMeX + shell: bash + run: | + cd Submodules/PelePhysics + git fetch "$GITHUB_WORKSPACE/pelephysics-pr" + git checkout $(git -C "$GITHUB_WORKSPACE/pelephysics-pr" rev-parse HEAD) + + echo "PelePhysics Submodule now points to:" + git rev-parse --short HEAD + + - name: System Dependencies + working-directory: PeleLMeX + run: .github/workflows/dependencies/dependencies_gcc10.sh + - name: Repo Dependencies + working-directory: PeleLMeX + run: Utils/CloneDeps.sh + - name: Build + working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ + run: | + make TPL COMP=gnu USE_MPI=TRUE + make -j 2 DIM=3 COMP=gnu USE_MPI=TRUE + - name: Run + working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ + run: | + mpirun -n 2 ./PeleLMeX3d.gnu.MPI.ex input.3d-regt amr.max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=1 amr.n_cell=32 32 64 + From 559fa26209f26f7a154c84582d63b953fc5bf73f Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 07:51:21 -0600 Subject: [PATCH 15/24] Fix invalid identifier for test --- .github/workflows/downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index a4d2626b5..67424cde0 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -230,7 +230,7 @@ jobs: export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') exit ${return} - PeleLMeX FlameSheet: + PeleLMeX-FlameSheet: name: GNU@9.3 MPI Run [PeleLMeX-FS] runs-on: ubuntu-latest env: From 6c9391aa7fd32354c8e436a1af482721782bd749 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 09:24:01 -0600 Subject: [PATCH 16/24] Make LMeX-clang-tidy need FlameSheet test --- .github/workflows/downstream.yml | 91 ++++++++++++++++---------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 67424cde0..0cf9b188a 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -14,8 +14,53 @@ concurrency: jobs: + PeleLMeX-FlameSheet: + name: PeleLMeX GNU@9.3 MPI Run [FlameSheet] + runs-on: ubuntu-latest + env: + {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code"} + + steps: + - name: Checkout PelePhysics + uses: actions/checkout@v4 + with: + path: pelephysics-pr + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha || github.sha }} + + - name: Clone PeleLMeX + run: | + git clone --recursive --shallow-submodules --single-branch \ + https://github.com/AMReX-Combustion/PeleLMeX.git + + - name: Point PeleLMeX/Submodules/PelePhysics to this PR + working-directory: PeleLMeX + shell: bash + run: | + cd Submodules/PelePhysics + git fetch "$GITHUB_WORKSPACE/pelephysics-pr" + git checkout $(git -C "$GITHUB_WORKSPACE/pelephysics-pr" rev-parse HEAD) + + echo "PelePhysics Submodule now points to:" + git rev-parse --short HEAD + + - name: System Dependencies + working-directory: PeleLMeX + run: .github/workflows/dependencies/dependencies_gcc10.sh + + - name: Build + working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ + run: | + make TPL COMP=gnu USE_MPI=TRUE + make -j 2 DIM=2 COMP=gnu USE_MPI=TRUE + - name: Run + working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ + run: | + mpirun -n 2 ./PeleLMeX2d.gnu.MPI.ex input.2d-regt amr.max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=1 amr.n_cell=32 64 + PeleLMeX-clang-tidy: name: PeleLMeX clang-tidy + needs: PeleLMeX-FlameSheet runs-on: ubuntu-24.04 strategy: matrix: @@ -230,49 +275,3 @@ jobs: export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') exit ${return} - PeleLMeX-FlameSheet: - name: GNU@9.3 MPI Run [PeleLMeX-FS] - runs-on: ubuntu-latest - env: - {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code"} - - steps: - - name: Checkout PelePhysics - uses: actions/checkout@v4 - with: - path: pelephysics-pr - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha || github.sha }} - - - name: Clone PeleLMeX - run: | - git clone --recursive --shallow-submodules --single-branch \ - https://github.com/AMReX-Combustion/PeleLMeX.git - - - name: Point PeleLMeX/Submodules/PelePhysics to this PR - working-directory: PeleLMeX - shell: bash - run: | - cd Submodules/PelePhysics - git fetch "$GITHUB_WORKSPACE/pelephysics-pr" - git checkout $(git -C "$GITHUB_WORKSPACE/pelephysics-pr" rev-parse HEAD) - - echo "PelePhysics Submodule now points to:" - git rev-parse --short HEAD - - - name: System Dependencies - working-directory: PeleLMeX - run: .github/workflows/dependencies/dependencies_gcc10.sh - - name: Repo Dependencies - working-directory: PeleLMeX - run: Utils/CloneDeps.sh - - name: Build - working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ - run: | - make TPL COMP=gnu USE_MPI=TRUE - make -j 2 DIM=3 COMP=gnu USE_MPI=TRUE - - name: Run - working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ - run: | - mpirun -n 2 ./PeleLMeX3d.gnu.MPI.ex input.3d-regt amr.max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=1 amr.n_cell=32 32 64 - From 7dec6f0d7280651a4a9c1ebe59f29c4978b43e50 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 09:54:04 -0600 Subject: [PATCH 17/24] Add PeleC-PMF test --- .github/workflows/downstream.yml | 61 ++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 0cf9b188a..8288be002 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -53,14 +53,70 @@ jobs: run: | make TPL COMP=gnu USE_MPI=TRUE make -j 2 DIM=2 COMP=gnu USE_MPI=TRUE + - name: Run working-directory: PeleLMeX/Exec/RegTests/FlameSheet/ run: | - mpirun -n 2 ./PeleLMeX2d.gnu.MPI.ex input.2d-regt amr.max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=1 amr.n_cell=32 64 + mpirun -n 2 ./PeleLMeX2d.gnu.MPI.ex input.2d-regt amr.max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=1 amr.n_cell=32 64 + + PeleC-PMF: + name: PeleC GNU@9.3 MPI Run [PMF] + runs-on: ubuntu-latest + env: + {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code"} + + steps: + - name: Checkout PelePhysics + uses: actions/checkout@v4 + with: + path: pelephysics-pr + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha || github.sha }} + + - name: Clone PeleC + run: | + git clone --recursive --shallow-submodules --single-branch \ + https://github.com/AMReX-Combustion/PeleC.git + + - name: Point PeleC/Submodules/PelePhysics to this PR + working-directory: PeleC + shell: bash + run: | + cd Submodules/PelePhysics + git fetch "$GITHUB_WORKSPACE/pelephysics-pr" + git checkout $(git -C "$GITHUB_WORKSPACE/pelephysics-pr" rev-parse HEAD) + + echo "PelePhysics Submodule now points to:" + git rev-parse --short HEAD + + - name: System Dependencies + working-directory: PeleC + run: | + set -eu -o pipefail + + sudo add-apt-repository ppa:ubuntu-toolchain-r/test + sudo apt-get update + + sudo apt-get install -y --no-install-recommends \ + build-essential \ + gcc-10 \ + libopenmpi-dev \ + openmpi-bin + + - name: Build + working-directory: PeleC/Exec/RegTests/PMF/ + run: | + make TPL COMP=gnu USE_MPI=TRUE + make -j 2 DIM=3 COMP=gnu USE_MPI=TRUE + + - name: Run + working-directory: PeleC/Exec/RegTests/PMF/ + run: | + mpirun -n 2 ./PeleC3d.gnu.MPI.ex example.inp max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=0 amr.n_cell=8 8 128 PeleLMeX-clang-tidy: name: PeleLMeX clang-tidy - needs: PeleLMeX-FlameSheet + needs: [PeleLMeX-FlameSheet, PeleC-PMF] runs-on: ubuntu-24.04 strategy: matrix: @@ -173,6 +229,7 @@ jobs: PeleC-clang-tidy: name: PeleC clang-tidy + needs: [PeleLMeX-FlameSheet, PeleC-PMF] runs-on: ubuntu-24.04 env: From b15782c5dd6249516c9d2bc6105e3d33846678a8 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 10:22:51 -0600 Subject: [PATCH 18/24] Remove extra line breaks --- .github/workflows/downstream.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 8288be002..a2855af04 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -12,7 +12,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} cancel-in-progress: true - jobs: PeleLMeX-FlameSheet: name: PeleLMeX GNU@9.3 MPI Run [FlameSheet] @@ -330,5 +329,4 @@ jobs: echo "::add-matcher::${{ github.workspace }}/PeleC/.github/problem-matchers/gcc.json" cat clang-tidy-warnings.txt export return=$(tail -n 1 clang-tidy-warnings.txt | awk '{print $2}') - exit ${return} - + exit ${return} \ No newline at end of file From 0a72f1896fb385e798284a4ae7d2168ea7e16817 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 12:59:32 -0600 Subject: [PATCH 19/24] Fix clang-tidy error from #605 --- Source/Eos/EosParams.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Eos/EosParams.H b/Source/Eos/EosParams.H index 1129df7e7..475b72096 100644 --- a/Source/Eos/EosParams.H +++ b/Source/Eos/EosParams.H @@ -122,7 +122,7 @@ struct InitParm> } } else if (density_lookup_type_string == "log") { parm_in->m_h_parm.dens_lookup = eos::density_lookup_type::log; - parm_in->m_h_parm.idx_density = get_var_index("lnRHO", h_manf_data_in, 0); + parm_in->m_h_parm.idx_density = get_var_index("lnRHO", h_manf_data_in, false); if (parm_in->m_h_parm.idx_density < 0) { parm_in->m_h_parm.idx_density = get_var_index("logRHO", h_manf_data_in); } From 460448d3ff80b8f9df095c8aa8d39e3cd3f3f4cc Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Fri, 15 Aug 2025 13:08:06 -0600 Subject: [PATCH 20/24] Formatting --- Source/Eos/EosParams.H | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Eos/EosParams.H b/Source/Eos/EosParams.H index 475b72096..92c53e501 100644 --- a/Source/Eos/EosParams.H +++ b/Source/Eos/EosParams.H @@ -122,7 +122,8 @@ struct InitParm> } } else if (density_lookup_type_string == "log") { parm_in->m_h_parm.dens_lookup = eos::density_lookup_type::log; - parm_in->m_h_parm.idx_density = get_var_index("lnRHO", h_manf_data_in, false); + parm_in->m_h_parm.idx_density = + get_var_index("lnRHO", h_manf_data_in, false); if (parm_in->m_h_parm.idx_density < 0) { parm_in->m_h_parm.idx_density = get_var_index("logRHO", h_manf_data_in); } From 7b0a0f53183af1e75fae2044c70e039b8fb532f6 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Sun, 17 Aug 2025 20:48:57 -0600 Subject: [PATCH 21/24] Remove EB-ON for LMeX --- .github/workflows/downstream.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index a2855af04..73dac2667 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -117,18 +117,10 @@ jobs: name: PeleLMeX clang-tidy needs: [PeleLMeX-FlameSheet, PeleC-PMF] runs-on: ubuntu-24.04 - strategy: - matrix: - enable_eb: [EB-OFF, EB-ON] - include: - - enable_eb: EB-OFF - use_eb: "OFF" - - enable_eb: EB-ON - use_eb: "ON" - fail-fast: false env: BUILD_DIR: ${{ github.workspace }}/build-clang-tidy-lmex + use_eb: "OFF" steps: - name: Checkout PelePhysics @@ -177,9 +169,9 @@ jobs: uses: actions/cache@v4 with: path: ~/.cache - key: ccache-${{ github.workflow }}-${{ github.job }}-${{ matrix.enable_eb }}-git-${{ github.sha }} + key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }} restore-keys: | - ccache-${{ github.workflow }}-${{ github.job }}-${{ matrix.enable_eb }}-git- + ccache-${{ github.workflow }}-${{ github.job }}-git- - name: Configure working-directory: PeleLMeX @@ -189,7 +181,7 @@ jobs: -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_CXX_COMPILER:STRING=clang++ \ -DCMAKE_C_COMPILER:STRING=clang \ - -DPELE_ENABLE_EB:BOOL=${{ matrix.use_eb }} \ + -DPELE_ENABLE_EB:BOOL=${{ env.use_eb }} \ -DPELE_ENABLE_MPI:BOOL=OFF \ -DPELE_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \ -DPELE_ENABLE_CLANG_TIDY:BOOL=ON \ From 530b6824a5bfe1fde0cdf9550ba5b45e0dcda164 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Mon, 18 Aug 2025 07:15:28 -0600 Subject: [PATCH 22/24] Edit workflow_dispatch for development only --- .github/workflows/downstream.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 73dac2667..fe52ebf6d 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -1,12 +1,11 @@ name: Downstream-CI on: - workflow_dispatch: - push: - branches: - - '**' - pull_request: - branches: [development] + workflow_dispatch: + push: + branches: [development] + pull_request: + branches: [development] concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} From 0d40289d42134e4a8e68fcf2de75f935b03910ee Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Mon, 18 Aug 2025 11:58:57 -0600 Subject: [PATCH 23/24] Simplifications per Jon --- .github/workflows/downstream.yml | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index fe52ebf6d..6e54bd68b 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -13,7 +13,7 @@ concurrency: jobs: PeleLMeX-FlameSheet: - name: PeleLMeX GNU@9.3 MPI Run [FlameSheet] + name: PeleLMeX GNU MPI Run [FlameSheet] runs-on: ubuntu-latest env: {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code"} @@ -58,7 +58,7 @@ jobs: mpirun -n 2 ./PeleLMeX2d.gnu.MPI.ex input.2d-regt amr.max_step=2 amr.plot_int=-1 amr.check_int=-1 amrex.abort_on_unused_inputs=1 amr.n_cell=32 64 PeleC-PMF: - name: PeleC GNU@9.3 MPI Run [PMF] + name: PeleC GNU MPI Run [PMF] runs-on: ubuntu-latest env: {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code"} @@ -97,7 +97,6 @@ jobs: sudo apt-get install -y --no-install-recommends \ build-essential \ - gcc-10 \ libopenmpi-dev \ openmpi-bin @@ -117,10 +116,6 @@ jobs: needs: [PeleLMeX-FlameSheet, PeleC-PMF] runs-on: ubuntu-24.04 - env: - BUILD_DIR: ${{ github.workspace }}/build-clang-tidy-lmex - use_eb: "OFF" - steps: - name: Checkout PelePhysics uses: actions/checkout@v4 @@ -180,7 +175,7 @@ jobs: -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_CXX_COMPILER:STRING=clang++ \ -DCMAKE_C_COMPILER:STRING=clang \ - -DPELE_ENABLE_EB:BOOL=${{ env.use_eb }} \ + -DPELE_ENABLE_EB:BOOL=OFF \ -DPELE_ENABLE_MPI:BOOL=OFF \ -DPELE_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \ -DPELE_ENABLE_CLANG_TIDY:BOOL=ON \ @@ -188,7 +183,7 @@ jobs: ${{ github.workspace }}/PeleLMeX - name: Check - working-directory: ${{ env.BUILD_DIR }} + working-directory: ${{ github.workspace }}/build-clang-tidy-lmex run: | cmake --build . --parallel ${{ env.NPROCS }} 2>&1 | tee -a clang-tidy-full-report.txt egrep "Warning:|Error:|warning:|error:" clang-tidy-full-report.txt \ @@ -206,11 +201,11 @@ jobs: ccache -s - name: Full report - working-directory: ${{ env.BUILD_DIR }} + working-directory: ${{ github.workspace }}/build-clang-tidy-lmex run: cat clang-tidy-full-report.txt - name: Short report - working-directory: ${{ env.BUILD_DIR }} + working-directory: ${{ github.workspace }}/build-clang-tidy-lmex run: | echo "::add-matcher::${{ github.workspace }}/PeleLMeX/.github/problem-matchers/gcc.json" cat clang-tidy-warnings.txt @@ -222,9 +217,6 @@ jobs: needs: [PeleLMeX-FlameSheet, PeleC-PMF] runs-on: ubuntu-24.04 - env: - BUILD_DIR: ${{ github.workspace }}/build-clang-tidy-c - steps: - name: Checkout PelePhysics uses: actions/checkout@v4 @@ -293,7 +285,7 @@ jobs: ${{github.workspace}}/PeleC - name: Check - working-directory: ${{ env.BUILD_DIR }} + working-directory: ${{ github.workspace }}/build-clang-tidy-c run: | cmake --build . --parallel ${{ env.NPROCS }} 2>&1 | tee -a clang-tidy-full-report.txt egrep "Warning:|Error:|warning:|error:" clang-tidy-full-report.txt \ @@ -311,11 +303,11 @@ jobs: ccache -s - name: Full report - working-directory: ${{ env.BUILD_DIR }} + working-directory: ${{ github.workspace }}/build-clang-tidy-c run: cat clang-tidy-full-report.txt - name: Short report - working-directory: ${{ env.BUILD_DIR }} + working-directory: ${{ github.workspace }}/build-clang-tidy-c run: | echo "::add-matcher::${{ github.workspace }}/PeleC/.github/problem-matchers/gcc.json" cat clang-tidy-warnings.txt From 7335ecc7ea9676dfed530f8e0ad1cfd37e2036a4 Mon Sep 17 00:00:00 2001 From: dmontgomeryNREL Date: Mon, 18 Aug 2025 12:14:01 -0600 Subject: [PATCH 24/24] Missed BUILD_DIR in run commands --- .github/workflows/downstream.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 6e54bd68b..499aab433 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -170,7 +170,7 @@ jobs: - name: Configure working-directory: PeleLMeX run: | - cmake -B"${BUILD_DIR}" \ + cmake -B"${{ github.workspace }}/build-clang-tidy-lmex" \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_CXX_COMPILER:STRING=clang++ \ @@ -271,7 +271,7 @@ jobs: - name: Configure working-directory: PeleC run: | - cmake -B"${BUILD_DIR}" \ + cmake -B"${{ github.workspace }}/build-clang-tidy-c" \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_CXX_COMPILER:STRING=clang++ \