Merge pull request #1046 from gridap/update-ci

Expanding and updating CI
gridap · Nov 8, 2024 · d16e907 · d16e907
2 parents b31f36d + 2477b6c
commit d16e907
Show file tree

Hide file tree

Showing 25 changed files with 129 additions and 163 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml
@@ -0,0 +1,25 @@
+name: Documentation
+
+on: [push, pull_request]
+
+# Cancel redundant CI tests automatically
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: '1.10'
+      - uses: julia-actions/cache@v2
+      - name: Install dependencies
+        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
+          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # If authenticating with SSH deploy key
+        run: julia --project=docs/ docs/make.jl
diff --git a/.github/workflows/Downgrade.yml b/.github/workflows/Downgrade.yml
@@ -0,0 +1,37 @@
+name: Downgrade
+
+on: [pull_request, workflow_dispatch]
+
+# Cancel redundant CI tests automatically
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  downgrade:
+    name: Downgrade ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.8' # Needs to be lowest supported version
+        os:
+          - ubuntu-latest
+        arch:
+          - x64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
+      - uses: julia-actions/cache@v2
+      - uses: julia-actions/julia-downgrade-compat@v1
+        with: # As per documentation, we exclude packages within the Julia standard library
+          skip: LinearAlgebra,SparseArrays,Random,Statistics,Test
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
+        with:
+          coverage: false
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -26,6 +26,11 @@ jobs:
           - x64
     steps:
       - uses: actions/checkout@v4
+        with:
+            fetch-depth: 0
+      - run: |
+          git fetch --tags
+          git branch --create-reflog main origin/main
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,97 +1,74 @@
 name: CI
-on: [push, pull_request]
+
+on: [push, pull_request, workflow_dispatch]
+
+# Cancel redundant CI tests automatically
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  test:
+  test: # Main CI tests
     name: Tests ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
-      matrix:
+      matrix: # Main tests for linux
         version:
           - '1.8'
+          - '1.9'
+          - '1.10'
         os:
           - ubuntu-latest
         arch:
           - x64
+          - x86
+        include: # Test macos/windows on latest LTS
+          - version: '1.10'
+            os: macos-latest
+            arch: aarch64
+          - version: '1.10'
+            os: windows-latest
+            arch: x64
     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: actions/cache@v1
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - 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
+          verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
-          
+
   drivers:
     name: Drivers ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
-          - '1.8'
+          - '1.10'
         os:
           - ubuntu-latest
         arch:
           - x64
     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: actions/cache@v1
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - run: |
           julia --color=yes --project=. --check-bounds=yes --depwarn=error -e '
             using Pkg; Pkg.instantiate()'
       - run: |
           julia --color=yes --project=. --check-bounds=yes --depwarn=error -e '
-            (1,) .== 1; include("test/GridapTests/runtests.jl")'
-
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
-        with:
-          version: '1.8'
-      - run: |
-          julia --project=docs -e '
-            using Pkg
-            Pkg.develop(PackageSpec(path=pwd()))
-            Pkg.instantiate()'
-#      - run: |
-#          julia --project=docs -e '
-#            using Documenter: doctest
-#            using Gridap
-#            doctest(Gridap)'
-      - run: julia --project=docs docs/make.jl
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
+            include("test/GridapTests/runtests.jl")'
diff --git a/.github/workflows/ci_x86.yml b/.github/workflows/ci_x86.yml
diff --git a/Project.toml b/Project.toml
@@ -34,32 +34,32 @@ WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
 [compat]
 AbstractTrees = "0.3.3, 0.4"
 Aqua = "0.8"
-BSON = "0.2.5, 0.3"
-BlockArrays = "0.12.12, 0.13, 0.14, 0.15, 0.16, 1"
-Combinatorics = "1.0.0"
+BSON = "0.3.4"
+BlockArrays = "1"
+Combinatorics = "1"
 DataStructures = "0.18.13"
 DocStringExtensions = "0.8.1, 0.9"
-FastGaussQuadrature = "0.4.2, 1"
-FileIO = "1.2.2, 1.3, 1.4"
-FillArrays = "0.8.4, 0.9, 0.10, 0.11, 0.12, 0.13, 1"
-ForwardDiff = "0.10.10"
-JLD2 = "0.1.11, 0.3, 0.4, 0.5"
-JSON = "0.21.0"
+FastGaussQuadrature = "0.4.5, 1"
+FileIO = "1.5"
+FillArrays = "1.11"
+ForwardDiff = "0.10.14"
+JLD2 = "0.5"
+JSON = "0.21"
 LineSearches = "7.0.1"
 LinearAlgebra = "1"
-NLsolve = "4.3.0"
+NLsolve = "4.5.1"
 NearestNeighbors = "0.4.8"
-PolynomialBases = "0.4.12"
+PolynomialBases = "0.4.13"
 Preferences = "1.4"
-QuadGK = "2.3.1, 2.4"
+QuadGK = "2.4"
 Random = "1"
 SparseArrays = "1"
 SparseMatricesCSR = "0.6.4"
-StaticArrays = "0.12.1, 1.0"
+StaticArrays = "1.4"
 Statistics = "1"
 Test = "1"
-WriteVTK = "1.12.0"
-julia = "1.3"
+WriteVTK = "1.21.1"
+julia = "1.6"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"

diff --git a/src/Algebra/AlgebraInterfaces.jl b/src/Algebra/AlgebraInterfaces.jl
@@ -223,26 +223,7 @@ end
 
 Matrix multiply a*b and add to result to c. Returns c.
 """
-function muladd!(c,a,b)
-  _muladd!(c,a,b)
-  c
-end
-
-@static if VERSION >= v"1.3"
-  function _muladd!(c,a,b)
-    mul!(c,a,b,1,1)
-  end
-else
-  function _muladd!(c,a,b)
-    @assert length(c) == size(a,1)
-    @assert length(b) == size(a,2)
-    @inbounds for j in 1:size(a,2)
-      for i in 1:size(a,1)
-        c[i] += a[i,j]*b[j]
-      end
-    end
-  end
-end
+muladd!(b,A,x) = mul!(b,A,x,one(eltype(b)),one(eltype(b)))
 
 """
     axpy_entries!(α::Number, A::T, B::T) where {T<: AbstractMatrix} -> T

diff --git a/src/CellData/CellData.jl b/src/CellData/CellData.jl
@@ -9,6 +9,10 @@ using Test
 using DocStringExtensions
 using FillArrays
 
+using NearestNeighbors
+using StaticArrays
+using DataStructures
+
 using Gridap.Helpers
 using Gridap.Algebra
 using Gridap.Arrays
@@ -17,9 +21,6 @@ using Gridap.Fields
 using Gridap.ReferenceFEs
 using Gridap.Geometry
 
-using NearestNeighbors
-using StaticArrays
-
 import Gridap.Arrays: lazy_append
 import Gridap.Arrays: get_array
 import Gridap.Arrays: evaluate!

diff --git a/src/CellData/DomainContributions.jl b/src/CellData/DomainContributions.jl
@@ -1,4 +1,3 @@
-using DataStructures
 
 """
 """

diff --git a/src/ODEs/TransientFESpaces.jl b/src/ODEs/TransientFESpaces.jl
@@ -149,10 +149,7 @@ Arrays.evaluate!(transient_space::FESpace, space::FESpace, t::Real) = space
 Arrays.evaluate(space::FESpace, t::Real) = space
 Arrays.evaluate(space::FESpace, t::Nothing) = space
 
-# TODO why is this needed?
-@static if VERSION >= v"1.3"
-  (space::FESpace)(t) = evaluate(space, t)
-end
+(space::FESpace)(t) = evaluate(space, t)
 (space::TrialFESpace)(t) = evaluate(space, t)
 (space::ZeroMeanFESpace)(t) = evaluate(space, t)
 

diff --git a/test/AdaptivityTests/MacroFEStokesTests.jl b/test/AdaptivityTests/MacroFEStokesTests.jl
@@ -14,7 +14,7 @@ function main(Dc,reftype)
   p_sol(x) = x[1] - 1.0/2.0
 
   domain = (Dc == 2) ? (0,1,0,1) : (0,1,0,1,0,1)
-  nc = (Dc == 2) ? (2,2) : (1,1,1)
+  nc = (Dc == 2) ? (1,1) : (1,1,1)
   model = simplexify(CartesianDiscreteModel(domain,nc))
 
   poly  = (Dc == 2) ? TRI : TET
@@ -65,7 +65,7 @@ end
 
 main(2,:barycentric)
 #main(2,:powellsabin)
-main(3,:barycentric)
+#main(3,:barycentric)
 #main(3,:powellsabin)
 
 end # module
diff --git a/test/ArraysTests/TablesTests.jl b/test/ArraysTests/TablesTests.jl
@@ -171,6 +171,4 @@ f = joinpath(d,"a.jld2")
 to_jld2_file(a,f)
 @test a == from_jld2_file(typeof(a),f)
 
-rm(d,recursive=true)
-
 end # module
diff --git a/test/GeometryTests/DiscreteModelsTests.jl b/test/GeometryTests/DiscreteModelsTests.jl
@@ -107,6 +107,4 @@ to_json_file(model2,filename)
 model3 = DiscreteModelFromFile(filename)
 test_discrete_model(model3)
 
-rm(d,recursive=true)
-
 end # module