From e565023cf0bbbbcc65319231a042946678f83623 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 9 Jan 2024 14:09:52 -0500 Subject: [PATCH 1/7] sync up with Microphysics parameter script changest (#405) --- Source/param/parse_maestro_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/param/parse_maestro_params.py b/Source/param/parse_maestro_params.py index adf35c8c4..587998bcd 100755 --- a/Source/param/parse_maestro_params.py +++ b/Source/param/parse_maestro_params.py @@ -206,7 +206,7 @@ def parse_params(infile, out_directory): for p in params_nm: cq.write(p.get_default_string()) - cq.write(p.get_query_string("C++")) + cq.write(p.get_query_string()) cq.write("\n") cq.close() From 23b48023746c2b62c59a3d17af7f56c32977a437 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sat, 20 Jan 2024 20:00:22 -0500 Subject: [PATCH 2/7] update the pip cache (#406) --- .github/workflows/check-ifdefs.yml | 11 +---------- .github/workflows/codespell.yml | 12 ++---------- .github/workflows/docs-test.yml | 12 ++---------- .github/workflows/gh-pages.yml | 20 ++------------------ 4 files changed, 7 insertions(+), 48 deletions(-) diff --git a/.github/workflows/check-ifdefs.yml b/.github/workflows/check-ifdefs.yml index 555886423..213bbda21 100644 --- a/.github/workflows/check-ifdefs.yml +++ b/.github/workflows/check-ifdefs.yml @@ -21,16 +21,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.10' - - - name: Cache pip - uses: actions/cache@v3 - with: - # this path is specific to Ubuntu - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' - name: Run check-ifdefs run: | diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 031a8eeb5..232f7d286 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -19,16 +19,8 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.10' - - - name: Cache pip - uses: actions/cache@v3 - with: - # this path is specific to Ubuntu - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' + cache: "pip" - name: Install dependencies run: pip install codespell diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 0fcda7559..14c6f6861 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -24,16 +24,8 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.10' - - - name: Cache pip - uses: actions/cache@v3 - with: - # this path is specific to Ubuntu - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' + cache: "pip" - name: Install dependencies run: pip install -r ./requirements.txt diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 4286b2bcd..1619c8726 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -19,24 +19,8 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.8' - - - name: Upgrade pip - run: | - # install pip=>20.1 to use "pip cache dir" - python3 -m pip install --upgrade pip - - - name: Get pip cache dir - id: pip-cache - run: echo "::set-output name=dir::$(pip cache dir)" - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + python-version: '3.11' + cache: "pip" - name: Install dependencies run: python3 -m pip install -r ./requirements.txt From b94c78597225c5dfc97006ebcf9142d48ee72ce4 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sat, 20 Jan 2024 20:01:00 -0500 Subject: [PATCH 3/7] add dependabot for github actions (#407) --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..b4f368c66 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +# 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: "github-actions" + directory: "/" + schedule: + interval: "weekly" From a6d40d4e9dd0db308bd893c2390a35fc5c4edecf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 20:20:06 -0500 Subject: [PATCH 4/7] Bump actions/setup-python from 2 to 5 (#411) * add dependabot for github actions (#407) * Bump actions/setup-python from 2 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: Michael Zingale Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/check-ifdefs.yml | 2 +- .github/workflows/codespell.yml | 2 +- .github/workflows/docs-test.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-ifdefs.yml b/.github/workflows/check-ifdefs.yml index 213bbda21..3f4ab8daa 100644 --- a/.github/workflows/check-ifdefs.yml +++ b/.github/workflows/check-ifdefs.yml @@ -19,7 +19,7 @@ jobs: fetch-depth: 0 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 232f7d286..986f946d6 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' cache: "pip" diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 14c6f6861..8721e4ecb 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -22,7 +22,7 @@ jobs: sudo apt install pandoc doxygen - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' cache: "pip" diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 1619c8726..149ffc4af 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -17,7 +17,7 @@ jobs: sudo apt install pandoc doxygen - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.11' cache: "pip" From fd23ba076c05d8c6daf293e7c69151077dbfda00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 20:30:01 -0500 Subject: [PATCH 5/7] Bump actions/checkout from 2 to 4 (#408) * add dependabot for github actions (#407) * Bump actions/checkout from 2 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: Michael Zingale Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/c-linter.yml | 2 +- .github/workflows/check-ifdefs.yml | 2 +- .github/workflows/codespell.yml | 2 +- .github/workflows/create_release.yml | 2 +- .github/workflows/docs-test.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- .github/workflows/gpu_action.yml | 2 +- .github/workflows/reacting_bubble-compare.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c-linter.yml b/.github/workflows/c-linter.yml index 3393104b8..04431c2c2 100644 --- a/.github/workflows/c-linter.yml +++ b/.github/workflows/c-linter.yml @@ -5,7 +5,7 @@ jobs: cpp-linter: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/check-ifdefs.yml b/.github/workflows/check-ifdefs.yml index 3f4ab8daa..9afa5f016 100644 --- a/.github/workflows/check-ifdefs.yml +++ b/.github/workflows/check-ifdefs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 986f946d6..2aeb59687 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python uses: actions/setup-python@v5 diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index c9053b0bc..5dd6c24b9 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get the version id: get_version diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 8721e4ecb..884c50540 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Install pandoc and doxygen diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 149ffc4af..055dbab52 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -10,7 +10,7 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install pandoc and doxygen run: | diff --git a/.github/workflows/gpu_action.yml b/.github/workflows/gpu_action.yml index 21946cb6d..395441215 100644 --- a/.github/workflows/gpu_action.yml +++ b/.github/workflows/gpu_action.yml @@ -5,7 +5,7 @@ jobs: gpu-compilation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/reacting_bubble-compare.yml b/.github/workflows/reacting_bubble-compare.yml index a895a3e58..232f01b95 100644 --- a/.github/workflows/reacting_bubble-compare.yml +++ b/.github/workflows/reacting_bubble-compare.yml @@ -5,7 +5,7 @@ jobs: reacting_bubble-2d: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From 198baa9e35280f7f82a051976f426516c38275de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 21 Jan 2024 10:10:00 -0500 Subject: [PATCH 6/7] Bump actions/upload-artifact from 1 to 4 (#409) * add dependabot for github actions (#407) * Bump actions/upload-artifact from 1 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 1 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v1...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: Michael Zingale Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/c-linter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-linter.yml b/.github/workflows/c-linter.yml index 04431c2c2..6856d1879 100644 --- a/.github/workflows/c-linter.yml +++ b/.github/workflows/c-linter.yml @@ -33,13 +33,13 @@ jobs: config_file: ${GITHUB_WORKSPACE}/.clang-tidy - name: Archive clang tidy report - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: clang-tidy-report path: clang-tidy-report.txt - name: Archive cppcheck report - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: cppcheck-report path: cppcheck-report.txt \ No newline at end of file From 4dd5ba242b463719287c688e0551521967db970d Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 1 Feb 2024 13:15:57 -0500 Subject: [PATCH 7/7] update to 24.02 --- external/Microphysics | 2 +- external/amrex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Microphysics b/external/Microphysics index 9d0655b75..649063a33 160000 --- a/external/Microphysics +++ b/external/Microphysics @@ -1 +1 @@ -Subproject commit 9d0655b75c2d7c0690fe637f8491fa572227a1dc +Subproject commit 649063a33f1ef83dd9acc457d7a79ceebcf3b60c diff --git a/external/amrex b/external/amrex index a068330e6..52393d3fa 160000 --- a/external/amrex +++ b/external/amrex @@ -1 +1 @@ -Subproject commit a068330e6c66b5d9a7c6ca0e1c874f318e73f4cc +Subproject commit 52393d3fafc835fa379f0420aa2de4ccdddf155a