Merge pull request #37 from sandialabs/fe/coverage_update

Update CI configuration and publish coverage data, Copy of #36 , with additional compat info
sandialabs · Nov 11, 2024 · 8fb7ab2 · 8fb7ab2
2 parents 794bfc3 + 4b775ab
commit 8fb7ab2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 14 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - master
-    tags: '*'
+    tags: ['*']
   pull_request:
 concurrency:
   # Skip intermediate builds: always.
@@ -12,26 +12,41 @@ concurrency:
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
   test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
+          - '1.10'
           - '1'
         os:
           - ubuntu-latest
-        arch:
-          - x64
+        include:
+          - os: windows-latest
+            version: '1'
+          - os: macOS-latest
+            version: '1'
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
-      - uses: julia-actions/cache@v1
+      - uses: julia-actions/cache@v2
       - name: Install OpenFASTWrappers
-        run: julia --project=./ -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sandialabs/OWENSOpenFASTWrappers.jl.git"))'
+        shell: julia --color=yes --project=. {0}
+        run: |
+          using Pkg
+          Pkg.add([
+              PackageSpec(url = "https://github.com/sandialabs/OWENSOpenFAST_jll.jl.git"),
+              PackageSpec(url = "https://github.com/sandialabs/OWENSOpenFASTWrappers.jl.git"),
+          ])
+        if: ${{ matrix.version == '1.10' }}
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v4
+        with:
+          file: lcov.info
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-    tags: '*'
+    tags: ['*']
   pull_request:
 
 jobs:
@@ -13,14 +13,16 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: '1'
+      - uses: julia-actions/cache@v2
       - name: Install dependencies
         env:
           PYTHON: ""
-        run: julia --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sandialabs/OWENSOpenFASTWrappers.jl.git")); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
+        run: julia --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sandialabs/OWENSOpenFAST_jll.jl.git")); Pkg.add(PackageSpec(url="https://github.com/sandialabs/OWENSOpenFASTWrappers.jl.git")); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
+
       - name: Build and deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token

diff --git a/Project.toml b/Project.toml
@@ -13,9 +13,14 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 LsqFit = "2fda8390-95c7-5789-9bda-21331edee243"
 NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
 OWENSOpenFASTWrappers = "1f4f357c-c864-4b71-8437-d48f9e1bb3e6"
+OWENSOpenFAST_jll = "ac0e1b5c-a850-5466-8291-e142bbb8e693"
 QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[sources]
+OWENSOpenFASTWrappers = {url = "https://github.com/sandialabs/OWENSOpenFASTWrappers.jl"}
+OWENSOpenFAST_jll = {url = "https://github.com/sandialabs/OWENSOpenFAST_jll.jl"}
+
 [compat]
 DelimitedFiles = "1"
 Dierckx = "0.5"
@@ -25,6 +30,8 @@ ForwardDiff = "0.10"
 HDF5 = "0.17"
 LsqFit = "0.15"
 NLsolve = "4"
+OWENSOpenFASTWrappers = "1"
+OWENSOpenFAST_jll = "4"
 QuadGK = "2"
 Statistics = "1"
 julia = "1"

diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![](https://img.shields.io/badge/docs-stable-blue.svg)](https://sandialabs.github.io/OWENSAero.jl)
 ![](https://github.com/sandialabs/OWENSAero.jl/workflows/CI/badge.svg)
+[![codecov.io](https://codecov.io/github/sandialabs/OWENSAero.jl/coverage.svg?branch=master)](https://codecov.io/github/sandialabs/OWENSAero.jl?branch=master)
 
 This repository contains a set of aerodynamic tools for VAWTs both steady and unsteady operation, 2D and
 3D (stacked 2D) convenience functions along with coupling to NREL's InflowWind for turbulent inflow. If using InflowWind (ifw flag) You