From d03e274e0f6c2402ed2f41178d9be231b05eaa8b Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Mon, 11 Nov 2024 18:36:30 +0100 Subject: [PATCH 1/3] Update CI configuration and publish coverage data --- .github/workflows/CI.yaml | 35 ++++++++++++++++++++--------- .github/workflows/Documentation.yml | 9 ++++---- Project.toml | 5 +++++ README.md | 1 + 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 693f13e..2101942 100644 --- 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 index 95f018d..1064d75 100644 --- 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,15 @@ 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.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 index 5deb64a..fc5fda9 100644 --- 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" diff --git a/README.md b/README.md index 91f8ca4..e961e5c 100644 --- 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 From 9cf9d2197ee57cdfce3901c8e8bee6cdf4c126ac Mon Sep 17 00:00:00 2001 From: kevmoor Date: Mon, 11 Nov 2024 13:56:09 -0700 Subject: [PATCH 2/3] Update compat --- Project.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Project.toml b/Project.toml index fc5fda9..b8606b1 100644 --- a/Project.toml +++ b/Project.toml @@ -30,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" From 4b775ab343b38c7a3631f3520217c90aedb8cf6f Mon Sep 17 00:00:00 2001 From: kevmoor Date: Mon, 11 Nov 2024 14:10:41 -0700 Subject: [PATCH 3/3] It looks like the develop install option might not be fully working with the new sources input, which is what I think I ran into before when trying to install OWENSOpenFASTWrappers by itself --- .github/workflows/Documentation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml index 1064d75..29d6f28 100644 --- a/.github/workflows/Documentation.yml +++ b/.github/workflows/Documentation.yml @@ -21,7 +21,8 @@ jobs: - name: Install dependencies env: PYTHON: "" - run: julia --project=docs/ -e 'using Pkg; 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