From 5502b25b4c65567a6aba434f5083bfa9464ef0a9 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 16:35:43 -0700 Subject: [PATCH 1/7] Avoid duplicated amrex.pdf --- .github/workflows/docs.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c927928f..98a8c00d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,6 +29,15 @@ jobs: mv build/latex/amrex.pdf source/ make html + - name: Prepare deployment + if: github.event_name == 'push' + run: | + if ! git diff --name-only ${{ github.event.before }}..HEAD 2>/dev/null \ + | grep -q "^Docs/source/"; then + echo "No sphinx doc changes — removing PDF to keep published version" + rm -f Docs/build/html/_downloads/*/amrex.pdf + fi + - name: Deploy if: github.event_name == 'push' && github.repository == 'AMReX-Codes/amrex-tutorials' && github.ref == 'refs/heads/main' env: From 0980ed1d490d6eb5b5e85ab1323f0de25a6acdb1 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 16:53:54 -0700 Subject: [PATCH 2/7] Update Windows CI --- .github/workflows/windows.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3df1ca86..4abda357 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,16 +28,19 @@ jobs: name: Clang w/o Fortran w/o MPI runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 + - uses: seanmiddleditch/gha-setup-ninja@master + - name: Set Up MSVC + uses: ilammy/msvc-dev-cmd@v1 - name: Build & Install shell: cmd - env: - CMAKE_GENERATOR_TOOLSET: "ClangCl" - CMAKE_GENERATOR: "Visual Studio 17 2022" run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64 cd ExampleCodes cmake -S . -B build ^ + -G Ninja ^ + -DCMAKE_C_COMPILER=clang-cl ^ + -DCMAKE_CXX_COMPILER=clang-cl ^ + -DCMAKE_CXX_STANDARD=20 ^ -DCMAKE_BUILD_TYPE=Release ^ -DBUILD_SHARED_LIBS=ON ^ -DCMAKE_VERBOSE_MAKEFILE=ON ^ From c35df4ec596390963a46666a30e23bef85cbd444 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 17:03:51 -0700 Subject: [PATCH 3/7] Update dependentbot --- .github/dependabot.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ede4b5bf..5c690e12 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,12 +1,9 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - +# Dependabot configuration +# ref: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates version: 2 updates: - - package-ecosystem: "" # See documentation for possible values - directory: "/" # Location of package manifests + - package-ecosystem: "github-actions" + directory: "/" schedule: interval: "weekly" target-branch: "main" From 47d8fad1531b9fa11d508bd1e6603ff70a1b1682 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 17:17:16 -0700 Subject: [PATCH 4/7] more updates --- .github/workflows/docs.yml | 6 +++++- .github/workflows/linux.yml | 10 +++++++++- .github/workflows/macos.yml | 10 +++++++++- .github/workflows/style.yml | 10 +++++++++- .github/workflows/windows.yml | 10 +++++++++- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 98a8c00d..582fdf21 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,5 +1,9 @@ name: Build and Deploy -on: [push, pull_request] +on: + push: + branches-ignore: + - 'dependabot/**' + pull_request: concurrency: group: ${{ github.ref }}-${{ github.head_ref }}-docs diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 21015604..cac02b31 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,6 +1,14 @@ name: linux -on: [push, pull_request] +on: + push: + branches-ignore: + - 'dependabot/**' + pull_request: + +concurrency: + group: ${{ github.ref }}-${{ github.head_ref }}-linux + cancel-in-progress: true jobs: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 534c64bd..4d3db5d0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,6 +1,14 @@ name: macos -on: [push, pull_request] +on: + push: + branches-ignore: + - 'dependabot/**' + pull_request: + +concurrency: + group: ${{ github.ref }}-${{ github.head_ref }}-macos + cancel-in-progress: true env: CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -fno-operator-names -Wno-pass-failed" diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 1686ecca..9398a389 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -1,6 +1,14 @@ name: Style -on: [push, pull_request] +on: + push: + branches-ignore: + - 'dependabot/**' + pull_request: + +concurrency: + group: ${{ github.ref }}-${{ github.head_ref }}-style + cancel-in-progress: true jobs: tabs: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4abda357..e6b5d56c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,6 +1,14 @@ name: windows -on: [push, pull_request] +on: + push: + branches-ignore: + - 'dependabot/**' + pull_request: + +concurrency: + group: ${{ github.ref }}-${{ github.head_ref }}-windows + cancel-in-progress: true jobs: # Build all tutorials From e373a5fa3fcfc7eca2a3eec049131493ecc6d074 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 18:01:43 -0700 Subject: [PATCH 5/7] save deploy-sha --- .github/workflows/docs.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 582fdf21..c81ef5eb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -36,10 +36,15 @@ jobs: - name: Prepare deployment if: github.event_name == 'push' run: | - if ! git diff --name-only ${{ github.event.before }}..HEAD 2>/dev/null \ - | grep -q "^Docs/source/"; then - echo "No sphinx doc changes — removing PDF to keep published version" - rm -f Docs/build/html/_downloads/*/amrex.pdf + LAST_DEPLOYED=$(curl -sSf "https://raw.githubusercontent.com/AMReX-Codes/AMReX-Codes.github.io/main/amrex/tutorials_html/.deploy-sha" 2>/dev/null || echo "") + if [ -n "$LAST_DEPLOYED" ] && git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null; then + if ! git diff --name-only ${LAST_DEPLOYED}..HEAD \ + | grep -q "^Docs/source/"; then + echo "No sphinx doc changes since ${LAST_DEPLOYED} — removing PDF to keep published version" + rm -f Docs/build/html/_downloads/*/amrex.pdf + fi + else + echo "No previous deploy SHA in repo history — keeping PDF" fi - name: Deploy @@ -70,6 +75,7 @@ jobs: git clone --quiet --depth=1 -b main git@github.com:AMReX-Codes/AMReX-Codes.github.io cd AMReX-Codes.github.io/amrex/tutorials_html/ rsync -q -av --checksum --progress ${DEPLOY_SOURCE}/. . + echo "${DEPLOY_SOURCE_HEAD}" > .deploy-sha git add --all . if [ -n "$(git status --porcelain)" ]; then git commit -m "Deploying from amrex-tutorials ${DEPLOY_SOURCE_HEAD}" --no-verify From 810b4b2a850430c69d755d0aba677cd8695e9faa Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 18:28:00 -0700 Subject: [PATCH 6/7] fix shallow clone --- .github/workflows/docs.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c81ef5eb..fc9ee88b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,14 +37,20 @@ jobs: if: github.event_name == 'push' run: | LAST_DEPLOYED=$(curl -sSf "https://raw.githubusercontent.com/AMReX-Codes/AMReX-Codes.github.io/main/amrex/tutorials_html/.deploy-sha" 2>/dev/null || echo "") - if [ -n "$LAST_DEPLOYED" ] && git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null; then - if ! git diff --name-only ${LAST_DEPLOYED}..HEAD \ - | grep -q "^Docs/source/"; then - echo "No sphinx doc changes since ${LAST_DEPLOYED} — removing PDF to keep published version" - rm -f Docs/build/html/_downloads/*/amrex.pdf + if [ -n "$LAST_DEPLOYED" ]; then + git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null || + git fetch --depth=1 origin "${LAST_DEPLOYED}" 2>/dev/null || true + if git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null; then + if ! git diff --name-only ${LAST_DEPLOYED}..HEAD \ + | grep -q "^Docs/source/"; then + echo "No sphinx doc changes since ${LAST_DEPLOYED} — removing PDF to keep published version" + rm -f Docs/build/html/_downloads/*/amrex.pdf + fi + else + echo "Commit ${LAST_DEPLOYED} not reachable — keeping PDF" fi else - echo "No previous deploy SHA in repo history — keeping PDF" + echo "No previous deploy SHA on website — keeping PDF" fi - name: Deploy From cac98dbecda8248ed5fede2ca9976ac48db4ad60 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 19 May 2026 18:54:01 -0700 Subject: [PATCH 7/7] Fix fetch depth --- .github/workflows/docs.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fc9ee88b..42f1d732 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,6 +17,7 @@ jobs: uses: actions/checkout@v4 with: persist-credentials: false + fetch-depth: ${{ github.event_name != 'push' && 1 || 0 }} - name: Dependencies run: | @@ -37,20 +38,14 @@ jobs: if: github.event_name == 'push' run: | LAST_DEPLOYED=$(curl -sSf "https://raw.githubusercontent.com/AMReX-Codes/AMReX-Codes.github.io/main/amrex/tutorials_html/.deploy-sha" 2>/dev/null || echo "") - if [ -n "$LAST_DEPLOYED" ]; then - git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null || - git fetch --depth=1 origin "${LAST_DEPLOYED}" 2>/dev/null || true - if git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null; then - if ! git diff --name-only ${LAST_DEPLOYED}..HEAD \ - | grep -q "^Docs/source/"; then - echo "No sphinx doc changes since ${LAST_DEPLOYED} — removing PDF to keep published version" - rm -f Docs/build/html/_downloads/*/amrex.pdf - fi - else - echo "Commit ${LAST_DEPLOYED} not reachable — keeping PDF" + if [ -n "$LAST_DEPLOYED" ] && git cat-file -e "${LAST_DEPLOYED}^{commit}" 2>/dev/null; then + if ! git diff --name-only ${LAST_DEPLOYED}..HEAD \ + | grep -q "^Docs/source/"; then + echo "No sphinx doc changes since ${LAST_DEPLOYED} — removing PDF to keep published version" + rm -f Docs/build/html/_downloads/*/amrex.pdf fi else - echo "No previous deploy SHA on website — keeping PDF" + echo "No previous deploy SHA reachable — keeping PDF" fi - name: Deploy