Merge pull request #1 from jacobwilliams/develop

CI updates

Author: jacobwilliams

.github/workflows/CI.yml

@@ -8,19 +8,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        gcc_v: [9] # Version of GFortran we want to use.
-        python-version: [3.7]
+        gcc_v: [10] # Version of GFortran we want to use.
+        python-version: [3.9]
     env:
       FC: gfortran-${{ matrix.gcc_v }}
       GCC_V: ${{ matrix.gcc_v }}
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.0.2
       with:
         submodules: recursive
 
-    - name: Install Python
+    - name: Set up Python 3.x
       uses: actions/setup-python@v1 # Use pip to install latest CMake, & FORD/Jin2For, etc.
       with:
         python-version: ${{ matrix.python-version }}
@@ -29,39 +29,52 @@ jobs:
       uses: ts-graphviz/setup-graphviz@v1
 
     - name: Setup Fortran Package Manager
-      uses: fortran-lang/setup-fpm@v3
+      uses: fortran-lang/setup-fpm@v4
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install Python dependencies
       if: contains( matrix.os, 'ubuntu')
       run: |
         python -m pip install --upgrade pip
-        pip install ford
+        pip install matplotlib ford
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
     - name: Install GFortran Linux
       if: contains( matrix.os, 'ubuntu')
       run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V}
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
-        --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
-        --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V}
+        sudo apt-get install lcov
+        sudo update-alternatives \
+           --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc_v }} 100 \
+           --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${{ matrix.gcc_v }} \
+           --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ matrix.gcc_v }}
 
-    - name: Compile
-      run: fpm build --profile release
+    # - name: Compile
+    #   run: fpm build --profile release
 
     - name: Run tests
-      run: fpm test
+      run: fpm test --profile debug --flag -coverage
+
+    - name: Create coverage report
+      run: |
+        mkdir -p ${{ env.COV_DIR }}
+        lcov --capture --initial --base-directory . --directory build/gfortran_*/ --output-file ${{ env.COV_DIR }}/coverage.base
+        lcov --capture --base-directory . --directory build/gfortran_*/ --output-file ${{ env.COV_DIR }}/coverage.capture
+        lcov --add-tracefile ${{ env.COV_DIR }}/coverage.base --add-tracefile ${{ env.COV_DIR }}/coverage.capture --output-file ${{ env.COV_DIR }}/coverage.info
+      env:
+        COV_DIR: build/coverage
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v2
+      with:
+        files: build/coverage/coverage.info
 
     - name: Build documentation
       run: ford ./stl-fortran.md
 
     - name: Deploy Documentation
       if: github.ref == 'refs/heads/master'
-      uses: JamesIves/github-pages-deploy-action@4.1.4
+      uses: JamesIves/github-pages-deploy-action@v4.3.3
       with:
         branch: gh-pages # The branch the action should deploy to.
         folder: doc  # The folder the action should deploy.

LICENSE.txt

@@ -1,7 +1,7 @@
 STL-FORTRAN
 https://github.com/jacobwilliams/stl-fortran
 
-Copyright (c) 2020-2021, Jacob Williams
+Copyright (c) 2020-2022, Jacob Williams
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -5,6 +5,13 @@
 
 Fortran code for reading and writing STL (STereoLithography) files.
 
+### Status
+
+[![GitHub release](https://img.shields.io/github/release/jacobwilliams/stl-fortran.svg)](https://github.com/jacobwilliams/stl-fortran/releases/latest)
+[![Build Status](https://github.com/jacobwilliams/stl-fortran/actions/workflows/CI.yml/badge.svg)](https://github.com/jacobwilliams/stl-fortran/actions)
+[![codecov](https://codecov.io/gh/jacobwilliams/stl-fortran/branch/master/graph/badge.svg)](https://codecov.io/gh/jacobwilliams/stl-fortran)
+[![last-commit](https://img.shields.io/github/last-commit/jacobwilliams/stl-fortran)](https://github.com/jacobwilliams/stl-fortran/commits/master)
+
 ### Example
 
 ```fortran
@@ -27,13 +34,19 @@ Fortran code for reading and writing STL (STereoLithography) files.
 
 ### Compiling
 
-A [Fortran Package Manager](https://github.com/fortran-lang/fpm) manifest file is included, so that the library and tests cases can be compiled with FPM. For example:
+A [Fortran Package Manager](https://github.com/fortran-lang/fpm) manifest file is included, so that the library and test cases can be compiled with FPM. For example:
 
 ```
 fpm build --profile release
 fpm test --profile release
 ```
 
+To use `stl-fortran` within your fpm project, add the following to your `fpm.toml` file:
+```toml
+[dependencies]
+stl-fortran = { git="https://github.com/jacobwilliams/stl-fortran.git" }
+```
+
 To generate the documentation using [FORD](https://github.com/Fortran-FOSS-Programmers/ford), run: ```ford stl-fortran.md```
 
 ### License

codecov.yml

@@ -0,0 +1,13 @@
+comment:
+  layout: header, changes, diff, sunburst
+coverage:
+  ignore:
+  - test
+  - doc
+  status:
+    patch:
+      default:
+        target: 20%
+    project:
+      default:
+        target: 60%

fpm.toml

@@ -1,6 +1,6 @@
 name = "stl-fortran"
 author = "Jacob Williams"
-copyright  = "Copyright (c) 2021, Jacob Williams"
+copyright  = "Copyright (c) 2020-2022, Jacob Williams"
 license = "BSD-3"
 description = "Fortran STL File I/O"
 homepage = "https://github.com/jacobwilliams/stl-fortran"
@@ -9,16 +9,11 @@ keywords = ["STL"]
 [build]
 auto-executables = false
 auto-examples = false
-auto-tests = false
+auto-tests = true
 link = ["lapack", "blas"]
 
 [library]
 source-dir = "src"
 
 [install]
-library = true
-
-[[test]]
-name = "test"
-source-dir = "tests"
-main = "test.f90"
+library = true