Merge branch 'development' into feat/annotations

NeuroML · May 29, 2024 · c989b81 · c989b81
2 parents 0895147 + e3ccc41
commit c989b81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,9 @@ name: Build all NML Java
 
 on:
   push:
-    branches: [ master, development, experimental, documentation_update, osb* ]
+    branches: [ master, development, experimental, documentation_update, osb*, update* ]
   pull_request:
-    branches: [ master, development, experimental, documentation_update, osb* ]
+    branches: [ master, development, experimental, documentation_update, osb*, update* ]
 
 jobs:
   build:
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         java-package: jdk

diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml
@@ -2,9 +2,9 @@ name: Run OMV tests
 
 on:
   push:
-    branches: [ master, development, experimental, documentation_update, osb* ]
+    branches: [ master, development, experimental, documentation_update, osb*, update* ]
   pull_request:
-    branches: [ master, development, experimental, documentation_update, osb* ]
+    branches: [ master, development, experimental, documentation_update, osb*, update* ]
 
 jobs:
   build:

diff --git a/LEMSexamples/test/.test.ex0.jnmleden.omt b/LEMSexamples/test/.test.ex0.jnmleden.omt
@@ -25,7 +25,7 @@ experiments:
         spike detection:
           method: threshold
           threshold: -55.1
-        tolerance: 0.00010867391304343428
+        tolerance: 0.00010869565217381418
   iafPop0:
     observables:
       spike times:
@@ -36,7 +36,7 @@ experiments:
         spike detection:
           method: threshold
           threshold: -55.1
-        tolerance: 0.00014932775619959672
+        tolerance: 0.00014938751120392748
   iafRefPop0:
     observables:
       spike times:
@@ -47,4 +47,4 @@ experiments:
         spike detection:
           method: threshold
           threshold: -55.1
-        tolerance: 0.0002189781021897893
+        tolerance: 0.0002189781021897893