Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into docs/structured_doc
Browse files Browse the repository at this point in the history
  • Loading branch information
sunethwarna committed Dec 30, 2022
2 parents 12e2d31 + d4dfc8f commit b67efeb
Show file tree
Hide file tree
Showing 3,131 changed files with 311,317 additions and 136,692 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@
/applications/MultilevelMonteCarloApplication/ @KratosMultiphysics/uncertainty-quantification
/applications/ParticleMechanicsApplication/ @KratosMultiphysics/mpm
/applications/RomApplication/ @KratosMultiphysics/rom
/applications/GeoMechanicsApplication/.................@KratosMultiphysics/geomechanics
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ about: List of things that are pending TO DO
---

**Description**
Description of what is the pourpose of this issue, which willl consist in a list of pending tasks
Description of what is the pourpose of this issue, which will 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
3 changes: 3 additions & 0 deletions .github/workflows/build_docker_image_wheelbuilder_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
- 'scripts/docker_files/docker_file_wheelbuilder_linux/*'
- '.github/workflows/build_docker_image_wheelbuilder_linux.yml'

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build_docker_image_wheelbuilder_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
- 'scripts/docker_files/docker_file_wheelbuilder_windows/*'
- '.github/workflows/build_docker_image_wheelbuilder_windows.yml'

permissions:
contents: read

jobs:
build:
runs-on: windows-latest
Expand Down
28 changes: 19 additions & 9 deletions .github/workflows/build_docker_images_for_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,35 @@ on:
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_ubuntu_22_04/*'
- '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_ubuntu_22_04/*'
- 'scripts/docker_files/docker_file_ci_centos_7/*'
- '.github/workflows/build_docker_images_for_ci.yml'

workflow_dispatch:

# for cancelling redundant runs
concurrency:
group: ci-${{ github.head_ref }}
cancel-in-progress: true

permissions:
contents: read

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

steps:
- 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
run: docker build . --file scripts/docker_files/docker_file_ci_ubuntu_22_04/DockerFile --tag kratosmultiphysics/kratos-image-ci-ubuntu-22-04
- name: Docker Login
uses: azure/docker-login@v1
with:
Expand All @@ -34,15 +44,15 @@ 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-ubuntu-20-04
run: docker push kratosmultiphysics/kratos-image-ci-ubuntu-22-04

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

steps:
- 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 +61,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
3 changes: 3 additions & 0 deletions .github/workflows/build_docker_images_with_kratos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
schedule:
- cron: '0 0 * * *' # update it every night

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/centos_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - https://github.com/KratosMultiphysics/Kratos

# Optional parameters:
# You can find a list will all the compiation options in INSTALL.md or here:
# You can find a list with all the compilation options in INSTALL.md or here:
# - https://github.com/KratosMultiphysics/Kratos/wiki/Compilation-options

add_app () {
Expand Down Expand Up @@ -34,13 +34,16 @@ rm -rf "${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}/CMakeFiles"

echo "Kratos build type is ${KRATOS_BUILD_TYPE}"

# Enable devtoolset-8
source scl_source enable devtoolset-8

# Configure
cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
${KRATOS_CMAKE_OPTIONS_FLAGS} \
-DUSE_MPI=OFF \
-DPYBIND11_PYTHON_VERSION="3.5" \
-DCMAKE_CXX_FLAGS="${KRATOS_CMAKE_CXX_FLAGS} -std=c++11 -O0 -Wall" \
-DPYBIND11_PYTHON_VERSION="3.8" \
-DCMAKE_CXX_FLAGS="${KRATOS_CMAKE_CXX_FLAGS} -O0 -Wall" \
-DCMAKE_UNITY_BUILD=ON \

# Buid
# Build
cmake --build "${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" --target install -- -j2
38 changes: 38 additions & 0 deletions .github/workflows/ci-dummy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: CI

# this is required to satisfy the required checks by replacing them with dummy checks
# see https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks

on:
pull_request:
branches:
- master
paths: # This must be the same as .github/workflows/ci.yml - "paths-ignore" !
- '**.md'
- 'documents/**'
- 'scripts/**'
- '.github/workflows/ci-dummy.yml'
- '.github/workflows/build_docker_image*.yml'
- '.github/workflows/nightly_build.yml'
- 'kratos/templates/**'
- 'kratos/python_scripts/application_generator/**'

permissions:
contents: read

jobs:
ubuntu:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
build-type: [Custom, FullDebug]
compiler: [gcc, clang]
steps:
- run: 'echo "Dummy build, no checks executed ..."'

windows:
runs-on: ubuntu-latest # ubuntu is faster than Win, hence no point using Win here

steps:
- run: 'echo "Dummy build, no checks executed ..."'
Loading

0 comments on commit b67efeb

Please sign in to comment.