diff --git a/.github/workflows/changelog_test.yml b/.github/workflows/changelog_test.yml index 1d0aead7ce..05e48ab11c 100644 --- 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 index 0fe35a5887..6fbd7b94c8 100644 --- 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 index 59d0464d6d..3b404dce8d 100644 --- 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 index fde10490bf..0aca597803 160000 --- a/src/pyne/pyne +++ b/src/pyne/pyne @@ -1 +1 @@ -Subproject commit fde10490bfb33bd07944b42391c3ffc108cab472 +Subproject commit 0aca5978037a373cffe6433934c87dd8e46e3b8e