From 5afb13d426a87b40e41f2f61977a4943c4f78c86 Mon Sep 17 00:00:00 2001 From: Arno Strouwen Date: Thu, 11 Jan 2024 17:05:06 +0100 Subject: [PATCH 1/2] more CI --- .github/workflows/CI.yml | 26 +++++++++++----------- .github/workflows/Downgrade.yml | 18 +++++++++++++--- test/runtests.jl | 38 +++++++++------------------------ 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3c3e6c94..4a05263e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,33 +10,35 @@ on: - master paths-ignore: - 'docs/**' + schedule: + - cron: '33 1 * * 4' jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: group: - Core version: - - '1.9' + - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} - - uses: actions/cache@v3 - env: - cache-name: cache-artifacts + - uses: julia-actions/cache@v1 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 }}- + token: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 + with: + depwarn: error - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v3 with: - file: lcov.info + file: lcov.info \ No newline at end of file diff --git a/.github/workflows/Downgrade.yml b/.github/workflows/Downgrade.yml index 01ff8cad..415f7b7c 100644 --- a/.github/workflows/Downgrade.yml +++ b/.github/workflows/Downgrade.yml @@ -10,20 +10,32 @@ on: - master paths-ignore: - 'docs/**' + schedule: + - cron: '33 1 * * 4' jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: - version: ['1'] + group: + - Core + version: + - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} - uses: cjdoris/julia-downgrade-compat-action@v1 -# if: ${{ matrix.version == '1.6' }} with: skip: Pkg,TOML + - uses: julia-actions/cache@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 \ No newline at end of file diff --git a/test/runtests.jl b/test/runtests.jl index d0804317..b1b28ad1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,38 +1,20 @@ using SafeTestsets using Test -@testset "Common Utilities " begin - @safetestset "Quality Assurance" begin - include("qa.jl") - end - @safetestset "States" begin - include("test_states.jl") - end +@testset "Common Utilities" begin + @safetestset "Quality Assurance" begin include("qa.jl") end + @safetestset "States" begin include("test_states.jl") end end @testset "Echo State Networks" begin - @safetestset "ESN Input Layers" begin - include("esn/test_input_layers.jl") - end - @safetestset "ESN Reservoirs" begin - include("esn/test_reservoirs.jl") - end - @safetestset "ESN States" begin - include("esn/test_states.jl") - end - @safetestset "ESN Train and Predict" begin - include("esn/test_train.jl") - end - @safetestset "ESN Drivers" begin - include("esn/test_drivers.jl") - end - @safetestset "Hybrid ESN" begin - include("esn/test_hybrid.jl") - end + @safetestset "ESN Input Layers" begin include("esn/test_input_layers.jl") end + @safetestset "ESN Reservoirs" begin include("esn/test_reservoirs.jl") end + @safetestset "ESN States" begin include("esn/test_states.jl") end + @safetestset "ESN Train and Predict" begin include("esn/test_train.jl") end + @safetestset "ESN Drivers" begin include("esn/test_drivers.jl") end + @safetestset "Hybrid ESN" begin include("esn/test_hybrid.jl") end end @testset "CA based Reservoirs" begin - @safetestset "RECA" begin - include("reca/test_predictive.jl") - end + @safetestset "RECA" begin include("reca/test_predictive.jl") end end From d1ab88faa5bef50291f3caabd89f66979a86ac77 Mon Sep 17 00:00:00 2001 From: Arno Strouwen Date: Thu, 11 Jan 2024 17:09:56 +0100 Subject: [PATCH 2/2] up std lib bounds for downgrade CI --- Project.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 577d3858..b3207f6e 100644 --- a/Project.toml +++ b/Project.toml @@ -24,14 +24,14 @@ DifferentialEquations = "7" Distances = "0.10" Distributions = "0.24.5, 0.25" LIBSVM = "0.8" -LinearAlgebra = "1.9" +LinearAlgebra = "1.10" MLJLinearModels = "0.9.2" NNlib = "0.8.4, 0.9" Optim = "1" Random = "1" SafeTestsets = "0.1" -SparseArrays = "1.9" -Statistics = "1.9" +SparseArrays = "1.10" +Statistics = "1.10" Test = "1" julia = "1.6"