Merge pull request #807 from gonuke/v322

V322
svalinn · May 19, 2022 · 0a07e08 · 0a07e08
2 parents 393eae8 + 2df56b3
commit 0a07e08
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/changelog_test.yml b/.github/workflows/changelog_test.yml
@@ -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
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -7,6 +7,9 @@ DAGMC Changelog
 Next version
 ====================
 
+v3.2.2
+====================
+
 **Changed:**
 
    * Placing installed CMake configuration files in project directory (#802)

diff --git a/src/pyne/pyne b/src/pyne/pyne