From 7f0e151f8158427e8d18c7127e2b774e35c2dfea Mon Sep 17 00:00:00 2001
From: Arno Strouwen <arno.strouwen@telenet.be>
Date: Thu, 11 Jan 2024 17:44:03 +0100
Subject: [PATCH] more CI

---
 .github/workflows/Documentation.yml |  3 ++-
 .github/workflows/Downgrade.yml     | 18 ++++++++++++---
 .github/workflows/ci.yml            | 36 ++++++++++++++---------------
 Project.toml                        |  6 +++--
 test/runtests.jl                    | 12 +++++-----
 5 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
index c38d54f..0fad583 100644
--- a/.github/workflows/Documentation.yml
+++ b/.github/workflows/Documentation.yml
@@ -6,7 +6,8 @@ on:
       - master
     tags: '*'
   pull_request:
-
+  schedule:
+    - cron: '53 12 * * 0'
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/Downgrade.yml b/.github/workflows/Downgrade.yml
index 01ff8ca..d45c75f 100644
--- a/.github/workflows/Downgrade.yml
+++ b/.github/workflows/Downgrade.yml
@@ -10,20 +10,32 @@ on:
       - master
     paths-ignore:
       - 'docs/**'
+  schedule:
+    - cron: '53 12 * * 0'
 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/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb45940..c35ee4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,56 +1,54 @@
 name: CI
 on:
-  push:
+  pull_request:
     branches:
       - master
     paths-ignore:
+      - 'docs/**'
       - 'LICENSE.md'
       - 'README.md'
       - '.github/workflows/CompatHelper.yml'
       - '.github/workflows/TagBot.yml'
-    tags: '*'
-  pull_request:
+
+  push:
     branches:
       - master
     paths-ignore:
+      - 'docs/**'
       - 'LICENSE.md'
       - 'README.md'
       - '.github/workflows/CompatHelper.yml'
       - '.github/workflows/TagBot.yml'
+
+  schedule:
+    - cron: '53 12 * * 0'
 jobs:
   test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        group:
+          - Core
         version:
           - '1'
         os:
           - ubuntu-latest
-        arch:
-          - x64
+          - macos-latest
+          - windows-latest
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
-      - 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/Project.toml b/Project.toml
index cab1cac..de37f79 100644
--- a/Project.toml
+++ b/Project.toml
@@ -21,11 +21,12 @@ LinearAlgebra = "1.10"
 ModelingToolkit = "8.51"
 OrdinaryDiffEq = "6.47"
 Plots = "1.10"
+SafeTestsets = "0.1"
 SparseArrays = "1.10"
 Sundials = "4.4"
 Symbolics = "5.2"
-TimerOutputs = "0.5"
 Test = "1"
+TimerOutputs = "0.5"
 julia = "1.10"
 
 [extras]
@@ -36,9 +37,10 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 
 [targets]
-test = ["Aqua", "CSVFiles", "DataFrames", "DiffEqBase", "LinearAlgebra", "OrdinaryDiffEq", "Plots", "Sundials", "Test", "TimerOutputs"]
+test = ["Aqua", "CSVFiles", "DataFrames", "DiffEqBase", "LinearAlgebra", "OrdinaryDiffEq", "Plots", "SafeTestsets", "Sundials", "Test", "TimerOutputs"]
diff --git a/test/runtests.jl b/test/runtests.jl
index 8a90a5e..eba3ff6 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,9 +1,9 @@
-using ReactionNetworkImporters, Test
+using SafeTestsets, Test
 
 @time begin
-    @time @testset "Quality Assurance" begin include("qa.jl") end
-    @time @testset "BNG Birth-Death Test" begin include("test_nullrxs_odes.jl") end
-    @time @testset "BNG Repressilator Test" begin include("test_repressilator_odes.jl") end
-    @time @testset "BNG Higher Order Test" begin include("test_higherorder_odes.jl") end
-    @time @testset "Matrix Input Test" begin include("test_mats.jl") end
+    @time @safetestset "Quality Assurance" begin include("qa.jl") end
+    @time @safetestset "BNG Birth-Death Test" begin include("test_nullrxs_odes.jl") end
+    @time @safetestset "BNG Repressilator Test" begin include("test_repressilator_odes.jl") end
+    @time @safetestset "BNG Higher Order Test" begin include("test_higherorder_odes.jl") end
+    @time @safetestset "Matrix Input Test" begin include("test_mats.jl") end
 end