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.

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

V322 #807

Merged
merged 3 commits into from
May 19, 2022
Merged

V322 #807

Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions .github/workflows/changelog_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ jobs:
apk add --no-cache bash git openssh
git --version

- name: Checkout repository
uses: actions/checkout@v2

- name: Housekeeping
run: |
- name: Checkout repository and housekeeping
uses: actions/checkout@v3
- run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
cd $GITHUB_WORKSPACE
CI/scripts/changelog_test.sh

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ enable_language(CXX)
# Set DAGMC version
set(DAGMC_MAJOR_VERSION 3)
set(DAGMC_MINOR_VERSION 2)
set(DAGMC_PATCH_VERSION 1)
set(DAGMC_PATCH_VERSION 2)
set(DAGMC_VERSION ${DAGMC_MAJOR_VERSION}.${DAGMC_MINOR_VERSION}.${DAGMC_PATCH_VERSION})

if(MSVC)
Expand Down
3 changes: 3 additions & 0 deletions doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ DAGMC Changelog
Next version
====================

v3.2.2
====================

**Changed:**

* Placing installed CMake configuration files in project directory (#802)
Expand Down
2 changes: 1 addition & 1 deletion src/pyne/pyne
Submodule pyne updated 151 files