add new stage in dockerfile to build pyne on release branch, remove B…

…uildTest job from virtualbox_image.yml
pyne · Aug 12, 2023 · de351fb · de351fb
1 parent 90f15b2
commit de351fb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/.github/actions/build-test/action.yml b/.github/actions/build-test/action.yml
@@ -9,10 +9,6 @@ inputs:
     description: Information about which version of HDF5 will be used for testing.
     required: true
     default: ''
-  build_pyne:
-    description: Condition which enables or disables the Building PyNE step.
-    required: false
-    default: 'NO'
 runs:
   using: "composite"
   steps: 
@@ -33,7 +29,6 @@ runs:
         echo "ADD_FLAG=${ADD_FLAG}" >> $GITHUB_ENV
         
     - name: Building PyNE
-      if: inputs.build_pyne == 'NO'
       shell: bash -l {0}
       run: |
         cd $GITHUB_WORKSPACE

diff --git a/.github/workflows/virtualbox_image.yml b/.github/workflows/virtualbox_image.yml
@@ -48,23 +48,6 @@ jobs:
         run: |
           echo "image_tag=$DOCKER_IMAGE_TAG" >> $GITHUB_OUTPUT
 
-  BuildTest:
-    needs: [pyne_image_build]
-    runs-on: ubuntu-latest
-
-    container:
-      image: ghcr.io/${{ github.repository_owner }}/pyne_ubuntu_22.04_py3/pyne${{ needs.pyne_image_build.outputs.image_tag }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: use BuildTest composite action
-        uses: ./.github/actions/build-test
-        with:
-          stage: ''
-          hdf5: ''
-          build_pyne: 'YES'
-
   pushing_test_stable_img:
     needs: [BuildTest]
     runs-on: ubuntu-latest

diff --git a/docker/ubuntu_22.04-dev.dockerfile b/docker/ubuntu_22.04-dev.dockerfile
@@ -131,8 +131,8 @@ RUN if [ "$build_hdf5" != "NO" ]; then \
     && git checkout tags/v0.13.0 \
     && pip install .
 
-# Build/Install PyNE
-FROM openmc AS pyne
+# Build/Install PyNE from develop branch
+FROM openmc AS pyne-dev
 ARG build_hdf5
 
 RUN export PYNE_HDF5_ARGS="" ;\
@@ -150,4 +150,26 @@ ENV PATH $HOME/.local/bin:$PATH
 RUN if [ "$build_pyne" = "YES" ]; then \
         cd $HOME \
         && nuc_data_make ; \
-    fi
+    fi \
+    ./ci-run-tests.sh python3
+
+# Build/Install PyNE from release branch
+FROM openmc AS pyne
+ARG build_hdf5
+
+RUN export PYNE_HDF5_ARGS="" ;\
+    if [ "$build_hdf5" != "NO" ]; then \
+            export PYNE_HDF5_ARGS="--hdf5 $HDF5_INSTALL_PATH" ; \
+    fi;
+COPY . $HOME/opt/pyne
+RUN cd $HOME/opt/pyne \
+    && python setup.py install --user \
+                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc \
+                                $PYNE_HDF5_ARGS \
+                                --clean -j 3;
+ENV PATH $HOME/.local/bin:$PATH
+RUN if [ "$build_pyne" = "YES" ]; then \
+        cd $HOME \
+        && nuc_data_make ; \
+    fi \
+    ./ci-run-tests.sh python3