Merge pull request #958 from svalinn/fix-win-ci

Update action versions
svalinn · Jul 19, 2024 · 98a3a10 · 98a3a10
2 parents 7e1cdb6 + d82cf04
commit 98a3a10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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}

diff --git 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
 ====================

diff --git 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)