Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update action versions #958

Merged
merged 3 commits into from
Jul 19, 2024
Merged

Update action versions #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad8904e
Update action versions
gonuke Jul 18, 2024
491b9d0
Update CHANGELOG.rst
gonuke Jul 18, 2024
d82cf04
Remove hardcoded path for bash
gonuke Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/windows_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================
Expand Down
2 changes: 1 addition & 1 deletion src/pyne/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Loading