From 22d334c1231c304a0173118c88df60c6ed9346af Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Mon, 18 Mar 2024 01:30:30 +0000 Subject: [PATCH] created action for each convertor --- .../action.yml | 6 ++--- .../dependencies_cad_to_openmc/action.yml | 26 +++++++++++++++++++ .../workflows/circular_torus_cad_to_dagmc.yml | 5 ++-- .../circular_torus_cad_to_openmc.yml | 5 ++-- .github/workflows/cuboid_cad_to_dagmc.yml | 5 ++-- .github/workflows/cuboid_cad_to_openmc.yml | 7 ++--- .github/workflows/cylinder_cad_to_dagmc.yml | 5 ++-- .github/workflows/cylinder_cad_to_openmc.yml | 5 ++-- .../elliptical_torus_cad_to_dagmc.yml | 6 ++--- .../elliptical_torus_cad_to_openmc.yml | 5 ++-- .../nested_cylinder_cad_to_dagmc.yml | 5 ++-- .../nested_cylinder_cad_to_openmc.yml | 5 ++-- .../workflows/nested_sphere_cad_to_dagmc.yml | 5 ++-- .../workflows/nested_sphere_cad_to_openmc.yml | 5 ++-- .github/workflows/sphere_cad_to_dagmc.yml | 5 ++-- .github/workflows/sphere_cad_to_openmc.yml | 5 ++-- .../two_touching_cuboids_cad_to_dagmc.yml | 5 ++-- .../two_touching_cuboids_cad_to_openmc.yml | 5 ++-- 18 files changed, 78 insertions(+), 37 deletions(-) rename .github/actions/{dependencies => dependencies_cad_to_dagmc}/action.yml (84%) create mode 100644 .github/actions/dependencies_cad_to_openmc/action.yml diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies_cad_to_dagmc/action.yml similarity index 84% rename from .github/actions/dependencies/action.yml rename to .github/actions/dependencies_cad_to_dagmc/action.yml index 1ae8509..2dfdf56 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies_cad_to_dagmc/action.yml @@ -19,10 +19,10 @@ runs: sudo apt-get upgrade -y sudo apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0 mamba activate - mamba install -y -c conda-forge moab gmsh python-gmsh "openmc=0.14.0=dagmc*nompi*" + mamba install -y -c conda-forge moab>=5.3.0 gmsh python-gmsh "openmc=0.14.0=dagmc*nompi*" pip install cadquery-ocp==7.7.2 pip install cadquery==2.4.0 - pip install cad_to_dagmc openmc_data_downloader - pip install CAD_to_OpenMC + pip install cad_to_dagmc + pip install openmc_data_downloader openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9 pip install .[tests] diff --git a/.github/actions/dependencies_cad_to_openmc/action.yml b/.github/actions/dependencies_cad_to_openmc/action.yml new file mode 100644 index 0000000..594bcc3 --- /dev/null +++ b/.github/actions/dependencies_cad_to_openmc/action.yml @@ -0,0 +1,26 @@ +name: composite action +description: builds +runs: + using: "composite" + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: install dependencies + shell: bash + run: | + + wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" + bash Miniforge3.sh -b -p "${HOME}/conda" + source "${HOME}/conda/etc/profile.d/conda.sh" + source "${HOME}/conda/etc/profile.d/mamba.sh" + sudo apt-get --allow-releaseinfo-change update + sudo apt-get update -y + sudo apt-get upgrade -y + sudo apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0 + mamba activate + mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*" + pip install CAD_to_OpenMC + pip install openmc_data_downloader + openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9 + pip install .[tests] diff --git a/.github/workflows/circular_torus_cad_to_dagmc.yml b/.github/workflows/circular_torus_cad_to_dagmc.yml index 292fae8..8009017 100644 --- a/.github/workflows/circular_torus_cad_to_dagmc.yml +++ b/.github/workflows/circular_torus_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/circular_torus_cad_to_openmc.yml b/.github/workflows/circular_torus_cad_to_openmc.yml index 7287185..78565d0 100644 --- a/.github/workflows/circular_torus_cad_to_openmc.yml +++ b/.github/workflows/circular_torus_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/cuboid_cad_to_dagmc.yml b/.github/workflows/cuboid_cad_to_dagmc.yml index a5464d4..04a8916 100644 --- a/.github/workflows/cuboid_cad_to_dagmc.yml +++ b/.github/workflows/cuboid_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/cuboid_cad_to_openmc.yml b/.github/workflows/cuboid_cad_to_openmc.yml index 16126aa..98250be 100644 --- a/.github/workflows/cuboid_cad_to_openmc.yml +++ b/.github/workflows/cuboid_cad_to_openmc.yml @@ -5,9 +5,10 @@ on: branches: - develop - main - push: + push: + branches: - main - + jobs: testing: runs-on: ubuntu-latest @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/cylinder_cad_to_dagmc.yml b/.github/workflows/cylinder_cad_to_dagmc.yml index 00b9516..96a41ae 100644 --- a/.github/workflows/cylinder_cad_to_dagmc.yml +++ b/.github/workflows/cylinder_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/cylinder_cad_to_openmc.yml b/.github/workflows/cylinder_cad_to_openmc.yml index 2ceb767..abe50e5 100644 --- a/.github/workflows/cylinder_cad_to_openmc.yml +++ b/.github/workflows/cylinder_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/elliptical_torus_cad_to_dagmc.yml b/.github/workflows/elliptical_torus_cad_to_dagmc.yml index ffff374..a3b8b70 100644 --- a/.github/workflows/elliptical_torus_cad_to_dagmc.yml +++ b/.github/workflows/elliptical_torus_cad_to_dagmc.yml @@ -5,9 +5,9 @@ on: branches: - develop - main - push: + push: + branches: - main - jobs: testing: runs-on: ubuntu-latest @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/elliptical_torus_cad_to_openmc.yml b/.github/workflows/elliptical_torus_cad_to_openmc.yml index 65c4095..bf9f28e 100644 --- a/.github/workflows/elliptical_torus_cad_to_openmc.yml +++ b/.github/workflows/elliptical_torus_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/nested_cylinder_cad_to_dagmc.yml b/.github/workflows/nested_cylinder_cad_to_dagmc.yml index 21ba2f2..7e9519b 100644 --- a/.github/workflows/nested_cylinder_cad_to_dagmc.yml +++ b/.github/workflows/nested_cylinder_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/nested_cylinder_cad_to_openmc.yml b/.github/workflows/nested_cylinder_cad_to_openmc.yml index 8575bc4..f02b4a1 100644 --- a/.github/workflows/nested_cylinder_cad_to_openmc.yml +++ b/.github/workflows/nested_cylinder_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/nested_sphere_cad_to_dagmc.yml b/.github/workflows/nested_sphere_cad_to_dagmc.yml index 97acf28..068539e 100644 --- a/.github/workflows/nested_sphere_cad_to_dagmc.yml +++ b/.github/workflows/nested_sphere_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/nested_sphere_cad_to_openmc.yml b/.github/workflows/nested_sphere_cad_to_openmc.yml index 6d3fdef..5a189c4 100644 --- a/.github/workflows/nested_sphere_cad_to_openmc.yml +++ b/.github/workflows/nested_sphere_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/sphere_cad_to_dagmc.yml b/.github/workflows/sphere_cad_to_dagmc.yml index be98a46..3ecbe2b 100644 --- a/.github/workflows/sphere_cad_to_dagmc.yml +++ b/.github/workflows/sphere_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/sphere_cad_to_openmc.yml b/.github/workflows/sphere_cad_to_openmc.yml index e717e2a..4edd77c 100644 --- a/.github/workflows/sphere_cad_to_openmc.yml +++ b/.github/workflows/sphere_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: diff --git a/.github/workflows/two_touching_cuboids_cad_to_dagmc.yml b/.github/workflows/two_touching_cuboids_cad_to_dagmc.yml index 4a130c4..cd28f5b 100644 --- a/.github/workflows/two_touching_cuboids_cad_to_dagmc.yml +++ b/.github/workflows/two_touching_cuboids_cad_to_dagmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_dagmc - shell: bash env: diff --git a/.github/workflows/two_touching_cuboids_cad_to_openmc.yml b/.github/workflows/two_touching_cuboids_cad_to_openmc.yml index 828f1f8..ceeb815 100644 --- a/.github/workflows/two_touching_cuboids_cad_to_openmc.yml +++ b/.github/workflows/two_touching_cuboids_cad_to_openmc.yml @@ -5,7 +5,8 @@ on: branches: - develop - main - push: + push: + branches: - main jobs: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: use upstream test composite action - uses: ./.github/actions/dependencies + uses: ./.github/actions/dependencies_cad_to_openmc - shell: bash env: