diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 05e57af849..c8f0c57e40 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -31,15 +31,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + pkg_mgr: ['apt', 'conda'] stage: [base_python, moab, dagmc, openmc] hdf5: [''] include: - - stage: dagmc + - pkg_mgr: 'apt' + stage: dagmc + hdf5: _hdf5 + - pkg_mgr: 'conda' + stage: dagmc hdf5: _hdf5 fail-fast: false container: - image: ghcr.io/pyne/pyne_ubuntu_22.04_py3${{ matrix.hdf5 }}/${{ matrix.stage }}:stable + image: ghcr.io/pyne/pyne_ubuntu_22.04_py3_${{ matrix.pkg_mgr }}${{ matrix.hdf5 }}/${{ matrix.stage }}:stable steps: - name: Checkout repository @@ -50,4 +55,3 @@ jobs: with: stage: ${{ matrix.stage }} hdf5: ${{ matrix.hdf5 }} - diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ebbb30b64c..909e44d9ea 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ Next Version **Change** * Move tests from nose to pytest (#1478 #1493) * Update MOAB dead link and add PyNE logo to readme file (#1481) - * Install packages with conda in Dockerfile (#1509 #1510) + * Install packages with conda in Dockerfile (#1509 #1510 #1511) **Fix** * Add missing rxname offsets (#1482)