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

Allow Double Down v1.1.0 Installation in Dockerfile #929

Merged
merged 38 commits into from
Feb 22, 2024
Merged

Allow Double Down v1.1.0 Installation in Dockerfile #929

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6166e4f
dd fix
ahnaf-tahmid-chowdhury Dec 8, 2023
d057970
fix Geant4_VERSION
ahnaf-tahmid-chowdhury Dec 8, 2023
3cb814f
typo fix
ahnaf-tahmid-chowdhury Dec 8, 2023
0b12126
dd version 1.1.0
ahnaf-tahmid-chowdhury Dec 9, 2023
7d8de72
Double Down v1.1.0 Installation in Dockerfile
ahnaf-tahmid-chowdhury Dec 9, 2023
91245ea
DOUBLE_DOWN_VERSION string fix
ahnaf-tahmid-chowdhury Dec 9, 2023
b9c88b6
add space
ahnaf-tahmid-chowdhury Dec 9, 2023
26ad7e3
fix DOUBLE_DOWN_VERSION branch for develop
ahnaf-tahmid-chowdhury Dec 9, 2023
2dfa97b
Update name string
ahnaf-tahmid-chowdhury Dec 11, 2023
2a1133e
Update name string
ahnaf-tahmid-chowdhury Dec 11, 2023
fca55ad
allow to chose building geant4 and dd from actions
ahnaf-tahmid-chowdhury Dec 11, 2023
13efae6
double_down default OFF
ahnaf-tahmid-chowdhury Dec 11, 2023
ff3ea55
build Geant4 or DD if enabled
ahnaf-tahmid-chowdhury Dec 11, 2023
78c2ac2
fix ${{ env.image_base_tag }}
ahnaf-tahmid-chowdhury Dec 11, 2023
91d51b0
fix syntax error
ahnaf-tahmid-chowdhury Dec 11, 2023
037e6fc
fix syntex
ahnaf-tahmid-chowdhury Dec 11, 2023
c3136a9
Merge branch 'develop' into dd-ci-fix
ahnaf-tahmid-chowdhury Dec 12, 2023
42a6ab5
add more conditions to container
ahnaf-tahmid-chowdhury Dec 12, 2023
787403a
DOUBLE_DOWN 1.1.0 REQUIRED
ahnaf-tahmid-chowdhury Dec 18, 2023
ef39d66
Update cmake/DAGMC_macros.cmake
ahnaf-tahmid-chowdhury Dec 18, 2023
09dfdb3
update pyne version
gonuke Sep 20, 2023
d9adb17
update version strings
gonuke Sep 20, 2023
ab2901c
Merge branch 'develop' into dd-ci-fix
ahnaf-tahmid-chowdhury Dec 21, 2023
fe7acca
remove extra variables
ahnaf-tahmid-chowdhury Dec 21, 2023
d2aaca9
one arg per line
ahnaf-tahmid-chowdhury Dec 21, 2023
e62f0ff
OFF -> no
ahnaf-tahmid-chowdhury Dec 21, 2023
27430e7
restore
ahnaf-tahmid-chowdhury Dec 21, 2023
4219b7c
no -> off
ahnaf-tahmid-chowdhury Dec 21, 2023
d645877
fix image tag
ahnaf-tahmid-chowdhury Dec 21, 2023
b68d9f8
bad substitution fix
ahnaf-tahmid-chowdhury Dec 21, 2023
36adea7
Merge remote-tracking branch 'upstream/develop' into dd-ci-fix
ahnaf-tahmid-chowdhury Feb 14, 2024
5f844bc
move embree to external_deps stage
ahnaf-tahmid-chowdhury Feb 16, 2024
7bd408c
find_package to set min version
ahnaf-tahmid-chowdhury Feb 21, 2024
b2609ff
embre 3.6.1
ahnaf-tahmid-chowdhury Feb 21, 2024
61dff56
set min version of DD and Geant4 in legacy way
ahnaf-tahmid-chowdhury Feb 21, 2024
abe00a4
if statements in CMake do not require the use of ${} for variable exp…
ahnaf-tahmid-chowdhury Feb 22, 2024
0097561
Merge branch 'develop' into dd-ci-fix
ahnaf-tahmid-chowdhury Feb 22, 2024
adcebb2
Merge branch 'develop' into dd-ci-fix
ahnaf-tahmid-chowdhury Feb 22, 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
27 changes: 20 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 @@ -5,10 +5,10 @@ inputs:
description: token for logging in to the GHCR
required: true
default: ''
geant_version:
geant4_version:
description: Version of Geant4
required: false
default: 11.1.2
default: off
ubuntu_version:
description: Underlying OS version
required: false
Expand All @@ -25,10 +25,10 @@ inputs:
description: Version of MOAB
required: false
default: 5.3.0
double_down:
description: Whether or not to test Double Down
double_down_version:
description: Version of Double Down
required: false
default: OFF
default: off

runs:
using: "composite"
Expand All @@ -43,11 +43,24 @@ runs:
- name: Installing Dependencies in Docker image
uses: firehed/multistage-docker-build-action@v1
with:
repository: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}-${{ inputs.compiler}}-geant4_${{ inputs.geant_version }}-hdf5_${{ inputs.hdf5_version }}-moab_${{ inputs.moab_version }}
repository: >
Copy link
Member

Choose a reason for hiding this comment

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

@ahnaf-tahmid-chowdhury : This change introduced a failure - you can’t split this across multiple lines - that we didn’t review carefully enough in the PR. Please submit an update to fix this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's wait for all the new Docker images to finish building, then we can rerun the Linux tests to see what happens.

Copy link
Member

Choose a reason for hiding this comment

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

I looked at the failed logs and saw that the failure is because this multi-line container name is resolving with spaces in the name, so it definitely needs to be fixed.

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
parallel: true
tag-latest-on-default: false
dockerfile: CI/Dockerfile
build-args: COMPILER=${{ inputs.compiler }}, geant4_version=${{ inputs.geant_version }}, UBUNTU_VERSION=${{ inputs.ubuntu_version }}, HDF5_VERSION=${{ inputs.hdf5_version }}, MOAB_BRANCH=${{ inputs.moab_version }}, double_down=${{ inputs.double_down }}
build-args: >
UBUNTU_VERSION=${{ inputs.ubuntu_version }},
COMPILER=${{ inputs.compiler }},
HDF5_VERSION=${{ inputs.hdf5_version }},
MOAB_VERSION=${{ inputs.moab_version }},
GEANT4_VERSION=${{ inputs.geant4_version }},
DOUBLE_DOWN_VERSION=${{ inputs.double_down_version }}
61 changes: 43 additions & 18 deletions .github/workflows/docker_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,29 @@ 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 : [
v1.0.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 know this version fails, so we should remove it.

We may also want to add off to this list so we can test without DD.

Copy link
Member Author

Choose a reason for hiding this comment

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

I have added this to check if CMake 3.16 shows any error messages since it is lower than 1.1.0, but it just passed. That means, CMake will also get failed for Geant4 as well.

v1.1.0,
]

name: Installing Dependencies, Building DAGMC and running tests
steps:
Expand All @@ -58,17 +59,34 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Configure docker image tag
run: |
image_base_tag=ghcr.io/${{ github.repository_owner }}/
image_base_tag+=dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}
image_base_tag+=-${{ matrix.compiler}}
image_base_tag+=-hdf5_${{ matrix.hdf5_version}}
image_base_tag+=-moab_${{ matrix.moab_version }}
image_base_tag+=-geant4_${{ matrix.geant4_version }}
image_base_tag+=-double_down_${{ matrix.double_down_version }}
echo "image_base_tag=${image_base_tag}" >> "$GITHUB_ENV"

- name: Installing Dependencies in Docker image
uses: firehed/multistage-docker-build-action@v1
with:
repository: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}
repository: ${{ env.image_base_tag }}
stages: base, external_deps, hdf5, moab, dagmc
server-stage: dagmc_test
quiet: false
parallel: true
tag-latest-on-default: ${{ env.tag-latest-on-default }}
dockerfile: CI/Dockerfile
build-args: double_down=${{ matrix.double_down}}, geant4_version=${{ matrix.geant_version }}, COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_versions }}, HDF5_VERSION=${{ matrix.hdf5_versions }}, MOAB_BRANCH=${{ matrix.moab_versions }}
build-args: >
UBUNTU_VERSION=${{ matrix.ubuntu_version }},
COMPILER=${{ matrix.compiler }},
HDF5_VERSION=${{ matrix.hdf5_version }},
MOAB_VERSION=${{ matrix.moab_version }},
GEANT4_VERSION=${{ matrix.geant4_version }},
DOUBLE_DOWN_VERSION=${{ matrix.double_down_version}}


push_stable_ci_img:
Expand All @@ -77,28 +95,28 @@ 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
Copy link
Member

Choose a reason for hiding this comment

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

This matrix should probably match the matrix above to make sure all the right images exist.

]

name: Pushing final images
steps:
Expand All @@ -110,10 +128,17 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Store image name
- name: Configure docker image tag
if: ${{ github.repository_owner == 'svalinn' }}
run: |
echo "image_base_tag=ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler }}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions }}-moab_${{ matrix.moab_versions }}" >> "$GITHUB_ENV"
image_base_tag=ghcr.io/${{ github.repository_owner }}/
image_base_tag+=dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}
image_base_tag+=-${{ matrix.compiler}}
image_base_tag+=-hdf5_${{ matrix.hdf5_version}}
image_base_tag+=-moab_${{ matrix.moab_version }}
image_base_tag+=-geant4_${{ matrix.geant4_version }}
image_base_tag+=-double_down_${{ matrix.double_down_version }}
echo "image_base_tag=${image_base_tag}" >> "$GITHUB_ENV"

- name: Push Image as latest img
if: ${{ github.repository_owner == 'svalinn' && github.ref == 'refs/heads/develop' }}
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/linux_upstream_test_double_down.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test against Double Down on PR merge
name: Test against Double Down development branch on PR merge

on:
# allows us to run workflows manually
Expand Down Expand Up @@ -27,6 +27,4 @@ jobs:
uses: ./.github/actions/upstream-test
with:
token: ${{ secrets.GITHUB_TOKEN }}
double_down: ON


double_down_version: develop
1 change: 0 additions & 1 deletion .github/workflows/linux_upstream_test_geant4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
geant_version: 11.1.2

2 changes: 1 addition & 1 deletion .github/workflows/linux_upstream_test_moab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test against MOAB master on PR merge
name: Test against MOAB development branch (master) on PR merge

on:
# allows us to run workflows manually
Expand Down
Loading
Loading