Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions .github/workflows/fpm-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,21 @@ jobs:
steps:
- name: Checkout code
Copy link
Member Author

Choose a reason for hiding this comment

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

This behaviour had to be changed. It was using stdlib-fpm avalailble on github and that do not include the changes in the PR. Therefore, the new changes proposed in a PR were not included in the coverage analyses.

uses: actions/checkout@v4.2.2
with:
ref: stdlib-fpm

- uses: fortran-lang/setup-fortran@main
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}

- name: Set up Python 3.x
uses: actions/setup-python@v1
with:
python-version: 3.x

- name: Install requirements
run: pip install --upgrade -r config/requirements.txt

- name: Setup Fortran Package Manager
uses: fortran-lang/setup-fpm@v8
with:
Expand All @@ -95,8 +101,9 @@ jobs:
run: |
sudo apt-get install lcov

- name: Run tests to generate the coverage.
run: fpm test --profile release --flag '-DWITH_XDP -DWITH_QP -coverage'
- run: | # Use fpm gnu ci to check xdp and qp
python config/fypp_deployment.py --with_xdp --with_qp
fpm test --profile release --flag '-DWITH_XDP -DWITH_QP -coverage'

- name: Create coverage report
run: |
Expand Down
1 change: 1 addition & 0 deletions STYLE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This style guide is a living document and proposed changes may be adopted after

* Source files should contain at most one `program`, `module`, or `submodule`
* The filename should match the program or module name and have the file extension `.f90` or `.F90` if preprocessing is required
* All included files must use the `.inc` extension. These files should be located in the `include/` directory.
* If the interface and implementation is split using submodules the implementation submodule file should have the same name as the
interface (parent) module but end in `_implementation`
E.g., `string_class.f90` and `string_class_implementation.f90`
Expand Down
5 changes: 4 additions & 1 deletion config/fypp_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ def deploy_stdlib_fpm(with_ilp64):
else:
base_folder = 'stdlib-fpm'

if not os.path.exists(base_folder+os.sep+'include'):
os.makedirs(base_folder+os.sep+'include')
if not os.path.exists(base_folder+os.sep+'src'):
os.makedirs(base_folder+os.sep+'src')
if not os.path.exists(base_folder+os.sep+'test'):
Expand All @@ -100,8 +102,9 @@ def recursive_copy(folder):
for root, _, files in os.walk(folder):
for file in files:
if file not in prune:
if file.endswith((".f90", ".F90", ".dat", ".npy", ".c", ".h")):
if file.endswith((".f90", ".F90", ".dat", ".npy", ".c", ".h", ".inc")):
shutil.copy2(os.path.join(root, file), base_folder+os.sep+folder+os.sep+file)
recursive_copy('include')
recursive_copy('src')
recursive_copy('test')
recursive_copy('example')
Expand Down
Loading