Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Linux build test to use updated docker images #949

Merged
merged 12 commits into from
Feb 29, 2024
Merged

Update Linux build test to use updated docker images #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
96b51fc
linux build test with updated docker images
ahnaf-tahmid-chowdhury Feb 29, 2024
c996fea
fix tag
ahnaf-tahmid-chowdhury Feb 29, 2024
cd5cf9a
Update linux build test to use updated docker images
ahnaf-tahmid-chowdhury Feb 29, 2024
df45051
single line
ahnaf-tahmid-chowdhury Feb 29, 2024
742e86e
remove >
ahnaf-tahmid-chowdhury Feb 29, 2024
ef332dd
git config --global --add safe.directory ${GITHUB_WORKSPACE}
ahnaf-tahmid-chowdhury Feb 29, 2024
e071852
add env
ahnaf-tahmid-chowdhury Feb 29, 2024
71ea39f
cd ${GITHUB_WORKSPACE}/build
ahnaf-tahmid-chowdhury Feb 29, 2024
3665096
remove spaces from image name
ahnaf-tahmid-chowdhury Feb 29, 2024
5fa5a7f
format without using '>'
ahnaf-tahmid-chowdhury Feb 29, 2024
9bfc4b2
add dd off
ahnaf-tahmid-chowdhury Feb 29, 2024
2ba589f
fix variables
ahnaf-tahmid-chowdhury Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .github/actions/upstream-test/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,21 @@ runs:
uses: firehed/multistage-docker-build-action@v1
with:
repository: >
ghcr.io/${{ github.repository_owner }}/
dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}
-${{ inputs.compiler}}
-hdf5_${{ inputs.hdf5_version}}
-moab_${{ inputs.moab_version }}
-geant4_${{ inputs.geant4_version }}
-double_down_${{ inputs.double_down_version }}
ghcr.io/${{
github.repository_owner
}}/dagmc-ci-ubuntu-${{
inputs.ubuntu_version
}}-${{
inputs.compiler
}}-hdf5_${{
inputs.hdf5_version
}}-moab_${{
inputs.moab_version
}}-geant4_${{
inputs.geant4_version
}}-double_down_${{
inputs.double_down_version
}}
stages: base, external_deps, hdf5, moab, dagmc
server-stage: dagmc_test
quiet: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build & Publish docker image for DAGMC-CI
name: Build & Publish docker image

on:
# allows us to run workflows manually
Expand Down
52 changes: 32 additions & 20 deletions .github/workflows/linux_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linux Build/Test for PR and collaborator push
name: Linux Build/Test

on:
# allows us to run workflows manually
Expand Down Expand Up @@ -36,31 +36,44 @@ jobs:

strategy:
matrix:
ubuntu_versions : [
ubuntu_version : [
20.04,
22.04,
]
compiler : [
gcc,
clang,
]
hdf5_versions : [
hdf5_version : [
1.14.3,
]
moab_versions : [
moab_version : [
5.4.1,
5.5.1,
]
double_down : [
OFF,
]
geant_version : [
geant4_version : [
10.7.4,
11.1.2
]
double_down_version : [
off,
v1.1.0,
]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to test with DD off since it changes the fundamental behavior of DAGMC


container:
image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}/moab:latest
image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{
matrix.ubuntu_version
}}-${{
matrix.compiler
}}-hdf5_${{
matrix.hdf5_version
}}-moab_${{
matrix.moab_version
}}-geant4_${{
matrix.geant4_version
}}-double_down_${{
matrix.double_down_version
}}/moab:latest

steps:
- name: Checkout repository
Expand All @@ -70,12 +83,12 @@ jobs:

- name: Building DAGMC
run: |
ln -s $GITHUB_WORKSPACE /root/build_dir/DAGMC
mkdir -p ./build
cd ./build
git config --global --add safe.directory $GITHUB_WORKSPACE
cmake ../ -DMOAB_DIR=${moab_install_dir} \
-DBUILD_GEANT4=ON \
git config --global --add safe.directory ${GITHUB_WORKSPACE}
mkdir -p build
cd build
cmake ../ \
-DMOAB_DIR=${moab_install_dir} \
-DBUILD_GEANT4=$([ "${{ matrix.geant4_version }}" != "off" ] && echo "ON" || echo "OFF") \
-DGEANT4_DIR=${geant4_install_dir} \
-DBUILD_CI_TESTS=ON \
-DBUILD_MW_REG_TESTS=OFF \
Expand All @@ -85,13 +98,12 @@ jobs:
-DCMAKE_CXX_COMPILER=${CXX} \
-DCMAKE_Fortran_COMPILER=gfortran \
-DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-DDOUBLE_DOWN=${double_down} \
-DCMAKE_CXX_FLAGS="-Werror=reorder" \
-Ddd_ROOT=${double_down_install_dir} && \
make -j2 && \
-DDOUBLE_DOWN=$([ "${{ matrix.double_down_version }}" != "off" ] && echo "ON" || echo "OFF") \
-Ddd_ROOT=${double_down_install_dir}
make -j${CI_JOBS}
make install

- name: Testing DAGMC
run: |
cd $GITHUB_WORKSPACE/build
cd ${GITHUB_WORKSPACE}/build
PATH=${install_dir}/dagmc/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
2 changes: 1 addition & 1 deletion doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Next version
* Update MOAB to 5.5.1 from 5.3.0 (#939 #940)
* Update README regarding OpenMC (#938)
* Simplify Housekeeping Process for DAGMC (#943)
* Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944)
* Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944 #949)
* Inline documentation improvements (#945)

v3.2.3
Expand Down
Loading