From ad8904e34beb5769bfd0200929646871f8cb6665 Mon Sep 17 00:00:00 2001 From: Paul Wilson Date: Wed, 17 Jul 2024 20:12:06 -0500 Subject: [PATCH 1/3] Update action versions Update versions of some actions to be compatible with newer Windows runner --- .github/workflows/windows_build_test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index a2a9ba273..442a931ae 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -39,7 +39,7 @@ jobs: runs-on: windows-2019 steps: - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: auto-activate-base: true activate-environment: "" @@ -89,7 +89,9 @@ jobs: cmake --build . --config Release cmake --install . --config Release - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + submodules: true - name: build DAGMC shell: bash -l {0} From 491b9d00a270f3adb365c3e6641b1f88326c93d3 Mon Sep 17 00:00:00 2001 From: Paul Wilson Date: Wed, 17 Jul 2024 20:15:43 -0500 Subject: [PATCH 2/3] Update CHANGELOG.rst --- doc/CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index d9ecb88f3..dec48de59 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -17,6 +17,7 @@ Next version * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944 #949) * Inline documentation improvements (#945) * Streamline dependencies of docker CI images (#951 #952) + * Update github actions to newer versions as necessary (#958) v3.2.3 ==================== From d82cf04228e7293f4ee1bbc29571fa54a03524dd Mon Sep 17 00:00:00 2001 From: Paul Wilson Date: Thu, 18 Jul 2024 11:41:05 -0500 Subject: [PATCH 3/3] Remove hardcoded path for bash --- src/pyne/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyne/CMakeLists.txt b/src/pyne/CMakeLists.txt index 27b06a40d..910c4df54 100644 --- a/src/pyne/CMakeLists.txt +++ b/src/pyne/CMakeLists.txt @@ -1,7 +1,7 @@ message("") if(MSVC) - execute_process(COMMAND C:/Program Files/Git/bin/bash.EXE -c + execute_process(COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/amalgamate_pyne.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" RESULT_VARIABLE STATUS OUTPUT_VARIABLE OUTPUT)