diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index ae4097a6a9..18c03c4576 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -8,7 +8,7 @@ on: - 'CI/?ocker**' - '.github/workflows/docker_publish.yml' - + jobs: build-base-img: runs-on: ubuntu-latest @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -67,7 +67,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build and push Dockerfile_1_housekeeping uses: docker/build-push-action@v2 @@ -112,7 +112,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build and push Dockerfile_1_external_deps uses: docker/build-push-action@v2 @@ -163,7 +163,7 @@ jobs: 1.10.4, ] moab_versions : [ - 5.3.0, + 5.4.0, develop, master, ] @@ -182,7 +182,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build and push Dockerfile_3_moab uses: docker/build-push-action@v2 @@ -215,12 +215,13 @@ jobs: name: Running Housekeeping scrips steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive - name: Setup run: | + git config --global --add safe.directory ${GITHUB_WORKSPACE} mkdir /root/build_dir/ echo "REPO_SLUG=${GITHUB_REPOSITORY}" >> $GITHUB_ENV echo "PULL_REQUEST=$(echo $GITHUB_REF | cut -d"/" -f3)" >> $GITHUB_ENV @@ -261,12 +262,17 @@ jobs: name: Installing and Testing DAGMC steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive - name: Setup run: | + git config --global --add safe.directory ${GITHUB_WORKSPACE} + git config --global --add safe.directory /github/home/ + git config --global --add safe.directory /github/home/.cache + git config --global --add safe.directory /github/home/.cache/pip + git config --global --add safe.directory /github/home/.cache/pip/http echo "MOAB_VERSION=${{ matrix.moab_versions }}" >> $GITHUB_ENV echo "COMPILER=${{ matrix.compiler }}" >> $GITHUB_ENV echo "HDF5_VERSION=${{ matrix.hdf5_versions }}" >> $GITHUB_ENV diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index 376d4d9458..279ac75ad5 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -14,7 +14,7 @@ jobs: image: ghcr.io/svalinn/dagmc-ci-ubuntu-18.04-housekeeping:stable steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup environment run: | diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 862b1488e1..872155fff3 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -58,7 +58,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index 615ac57085..cd9e917dab 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -22,7 +22,7 @@ jobs: runs-on: macos-10.15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Initial setup shell: bash -l {0} diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 2919511dcf..8a36af3dc9 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -63,7 +63,7 @@ jobs: cmake --build . --config Release cmake --install . --config Release - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: build DAGMC shell: bash -l {0} diff --git a/.gitmodules b/.gitmodules index b9435cb704..a6e62b646d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/pyne/pyne"] path = src/pyne/pyne - url = https://github.com/pyne/pyne + url = https://github.com/pyne/pyne.git diff --git a/CI/Dockerfile b/CI/Dockerfile index 2f25be054b..3a1753b7ec 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -80,6 +80,8 @@ RUN /root/etc/CI/docker/build_hdf5.sh FROM hdf5 AS moab +ENV PYTHONPATH=/root/build_dir/moab/bld/pymoab/lib/python3.6/site-packages + # Set MOAB env variable ENV moab_build_dir=${build_dir}/moab ENV moab_install_dir=${install_dir}/moab @@ -91,3 +93,4 @@ RUN if [ "${MOAB_VERSION}" != "master" ] && [ "${MOAB_VERSION}" != "develop" ]; /root/etc/CI/docker/build_moab.sh; \ fi; +RUN python -c "import pymoab" diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index f967d3c2d3..db67b241fb 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -10,6 +10,7 @@ Next version **Changed:** * Using multi stage Dockerfile to reduce the number of Dockerfile (#813) + * Adding safe folder to allow CI to compile DAGMC (#814) * Correction to CMake variable name in OpenMC install instructions (#817)