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 committed Dec 16, 2024
2 parents 6006f65 + 06eeea3 commit d8fb7e8
Show file tree
Hide file tree
Showing 9,383 changed files with 2,124,953 additions and 410,664 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
/applications/IgaApplication/ @KratosMultiphysics/nurbs-breps
/applications/HDF5Application/ @KratosMultiphysics/hdf5-application
/applications/MultilevelMonteCarloApplication/ @KratosMultiphysics/uncertainty-quantification
/applications/ParticleMechanicsApplication/ @KratosMultiphysics/mpm
/applications/MPMApplication/ @KratosMultiphysics/mpm
/applications/RomApplication/ @KratosMultiphysics/rom
/applications/GeoMechanicsApplication/.................@KratosMultiphysics/geomechanics
/applications/GeoMechanicsApplication/.................@KratosMultiphysics/geomechanics
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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
Expand Down
43 changes: 43 additions & 0 deletions .github/get_files_changed_in_pr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import json
import subprocess
from os import environ


def get_files_changed_in_pr(pr_number: int) -> list[str]:
# from: https://stackoverflow.com/questions/25071579/list-all-files-changed-in-a-pull-request-in-git-github

modified_files: list[str] = []

try:
process_output: str = subprocess.run(
[
"gh",
"pr",
"view",
str(pr_number),
"--json",
"files",
"--jq",
".files.[].path",
],
check=True,
capture_output=True,
text=True,
).stdout

modified_files = process_output.splitlines()

except Exception as e:
print(f"An error occured while getting the modified files: {e}")

return modified_files


if __name__ == "__main__":
assert "GITHUB_TOKEN" in environ, 'missing environment variable "GITHUB_TOKEN"!'
assert "GITHUB_PR_NUMBER" in environ, 'missing environment variable "GITHUB_PR_NUMBER"!'

pr_number: int = int(environ["GITHUB_PR_NUMBER"])
modified_files = get_files_changed_in_pr(pr_number)

print(json.dumps(modified_files))
4 changes: 2 additions & 2 deletions .github/workflows/build_docker_image_wheelbuilder_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build scripts/docker_files/docker_file_wheelbuilder_linux/ --tag kratosmultiphysics/kratos-wheelbuilder-linux
- name: Docker Login
uses: azure/docker-login@v1
uses: azure/docker-login@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_docker_image_wheelbuilder_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build scripts/docker_files/docker_file_wheelbuilder_windows/ --tag kratosmultiphysics/kratos-wheelbuilder-windows
- name: Docker Login
uses: azure/docker-login@v1
uses: azure/docker-login@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
27 changes: 4 additions & 23 deletions .github/workflows/build_docker_images_for_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ on:
- 'master'
paths:
- 'scripts/docker_files/docker_file_ci_ubuntu_22_04/*'
- 'scripts/docker_files/docker_file_ci_ubuntu_20_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_22_04/*'
- 'scripts/docker_files/docker_file_ci_ubuntu_20_04/*'
- 'scripts/docker_files/docker_file_ci_centos_7/*'
- '.github/workflows/build_docker_images_for_ci.yml'

Expand All @@ -31,32 +29,15 @@ permissions:
contents: read

jobs:
build-docker-ubuntu:
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
- name: Docker Login
uses: azure/docker-login@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- 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

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

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
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
uses: azure/docker-login@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -69,11 +50,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
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
uses: azure/docker-login@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_docker_images_with_kratos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- 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
uses: azure/docker-login@v1
uses: azure/docker-login@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/centos_configure.sh

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/ci-dummy.yml

This file was deleted.

Loading

0 comments on commit d8fb7e8

Please sign in to comment.