Skip to content

Commit

Permalink
Merge branch 'master' into core/adding-kernel-library-list
Browse files Browse the repository at this point in the history
  • Loading branch information
loumalouomega authored Jul 26, 2022
2 parents 27f966e + 231a4d1 commit da647fb
Show file tree
Hide file tree
Showing 2,441 changed files with 176,610 additions and 79,239 deletions.
5 changes: 4 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/applications/ConstitutiveLawsApplication/ @KratosMultiphysics/structural-mechanics
/applications/ContactStructuralMechanicsApplication/ @KratosMultiphysics/structural-mechanics
/applications/FluidDynamicsApplication/ @KratosMultiphysics/fluid-maintainers
/applications/FluidDynamicsBiomedicalApplication/ @KratosMultiphysics/biomedical
/applications/ConvectionDiffusionApplication @KratosMultiphysics/fluid-maintainers
/applications/MappingApplication/ @KratosMultiphysics/cosimulation
/applications/CoSimulationApplication/ @KratosMultiphysics/cosimulation
Expand All @@ -28,5 +29,7 @@
/applications/ChimeraApplication/ @KratosMultiphysics/chimera
/applications/IgaApplication/ @KratosMultiphysics/nurbs-breps
/applications/HDF5Application/ @KratosMultiphysics/hdf5-application
/applications/MultilevelMonteCarloApplication/ @KratosMultiphysics/uncertainty-quantification
/applications/MultilevelMonteCarloApplication/ @KratosMultiphysics/uncertainty-quantification
/applications/ParticleMechanicsApplication/ @KratosMultiphysics/mpm
/applications/RomApplication/ @KratosMultiphysics/rom
/applications/GeoMechanicsApplication/.................@KratosMultiphysics/geomechanics
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ about: List of things that are pending TO DO
Description of what is the pourpose of this issue, which willl consist in a list of pending tasks

**TODO**
[ ] Update XX library
[ ] Refactor YY class
[ ] Document ZZ implementation
- [ ] Update XX library
- [ ] Refactor YY class
- [ ] Document ZZ implementation
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build scripts/docker_files/docker_file_wheelbuilder_linux/ --tag kratosmultiphysics/kratos-wheelbuilder-linux
- name: Docker Login
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build scripts/docker_files/docker_file_wheelbuilder_windows/ --tag kratosmultiphysics/kratos-wheelbuilder-windows
- name: Docker Login
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_docker_images_for_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ on:
- 'master'
paths:
- 'scripts/docker_files/docker_file_ci_ubuntu_20_04/*'
- 'scripts/docker_files/docker_file_ci_centos_7_python35/*'
- 'scripts/docker_files/docker_file_ci_centos_7/*'
- '.github/workflows/build_docker_images_for_ci.yml'
pull_request:
branches:
- 'master'
paths:
- 'scripts/docker_files/docker_file_ci_ubuntu_20_04/*'
- 'scripts/docker_files/docker_file_ci_centos_7_python35/*'
- 'scripts/docker_files/docker_file_ci_centos_7/*'
- '.github/workflows/build_docker_images_for_ci.yml'

jobs:
build-docker-ubuntu:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build . --file scripts/docker_files/docker_file_ci_ubuntu_20_04/DockerFile --tag kratosmultiphysics/kratos-image-ci-ubuntu-20-04
- name: Docker Login
Expand All @@ -40,9 +40,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build . --file scripts/docker_files/docker_file_ci_centos_7_python35/DockerFile --tag kratosmultiphysics/kratos-image-ci-centos7-python35
run: docker build . --file scripts/docker_files/docker_file_ci_centos_7/DockerFile --tag kratosmultiphysics/kratos-image-ci-centos7
- name: Docker Login
uses: azure/docker-login@v1
with:
Expand All @@ -51,4 +51,4 @@ jobs:
- name: Publish the Docker image
if: ${{ github.event_name == 'push'}}
# only push the new image when the changes are merged to master
run: docker push kratosmultiphysics/kratos-image-ci-centos7-python35
run: docker push kratosmultiphysics/kratos-image-ci-centos7
2 changes: 1 addition & 1 deletion .github/workflows/build_docker_images_with_kratos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build . --file scripts/docker_files/docker_file_ci_ubuntu_20_04/DockerFile --tag kratosmultiphysics/kratos-image-ubuntu-20-04
- name: Docker Login
Expand Down
Loading

0 comments on commit da647fb

Please sign in to comment.