From 37ae25f7cf5afbe4b76699daa9581d106402dd60 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 13:38:38 +0100 Subject: [PATCH 1/3] Test on experimental also --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2478106e..bfa31adb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: Java CI with Ant on: push: - branches: [ master, development ] + branches: [ master, development, experimental ] pull_request: - branches: [ master, development ] + branches: [ master, development, experimental ] jobs: build_and_test: From 9863b52b7e6c60f80ce2880029fa2498dd3034b4 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 17:22:23 +0100 Subject: [PATCH 2/3] Update to use jnml jar v0.13.1 --- nC.bat | 2 +- nCenv.sh | 2 +- nbproj/nbproject/project.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nC.bat b/nC.bat index 6b1c5f17..36dc2f7d 100755 --- a/nC.bat +++ b/nC.bat @@ -21,7 +21,7 @@ set NC_MAX_MEMORY=500M set NC_VERSION=1.7.5 -set JNEUROML_VERSION=0.13.0 +set JNEUROML_VERSION=0.13.1 REM ----------------------------- REM Should no longer be changed. **Very old version** of lems/nml libs... diff --git a/nCenv.sh b/nCenv.sh index 38c62fd4..1fb20771 100755 --- a/nCenv.sh +++ b/nCenv.sh @@ -21,7 +21,7 @@ export NC_MAX_MEMORY=450M # Current version of neuroConstruct export NC_VERSION=1.7.5 -export JNEUROML_VERSION=0.13.0 +export JNEUROML_VERSION=0.13.1 ######### # These are for **very old versions** of NML2/LEMS libraries... diff --git a/nbproj/nbproject/project.xml b/nbproj/nbproject/project.xml index 159e0691..a4218a95 100644 --- a/nbproj/nbproject/project.xml +++ b/nbproj/nbproject/project.xml @@ -12,7 +12,7 @@ .. ${project.dir}/build.xml 1.7.5 - 0.13.0 + 0.13.1 From 9d8716e13cc4db8d921b484e33d488f67ace82e8 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 11 Jun 2024 17:27:21 +0100 Subject: [PATCH 3/3] Update to v1.7.6 --- build.xml | 4 ++-- nC.bat | 2 +- nCenv.sh | 2 +- nbproj/nbproject/project.xml | 2 +- src/ucl/physiol/neuroconstruct/project/GeneralProperties.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index c1925453..c27070d7 100755 --- a/build.xml +++ b/build.xml @@ -27,9 +27,9 @@ - + - + diff --git a/nC.bat b/nC.bat index 36dc2f7d..26c6e91f 100755 --- a/nC.bat +++ b/nC.bat @@ -19,7 +19,7 @@ REM than half your total physical memory is best. REM *** ASKING FOR MORE MEMORY THAN HALF MAX ON WINDOWS HAS LED TO THE APPLICATION CRASHING *** set NC_MAX_MEMORY=500M -set NC_VERSION=1.7.5 +set NC_VERSION=1.7.6 set JNEUROML_VERSION=0.13.1 diff --git a/nCenv.sh b/nCenv.sh index 1fb20771..d7704f12 100755 --- a/nCenv.sh +++ b/nCenv.sh @@ -19,7 +19,7 @@ export NC_MAX_MEMORY=450M # The rest of the settings below shouldn't have to change # Current version of neuroConstruct -export NC_VERSION=1.7.5 +export NC_VERSION=1.7.6 export JNEUROML_VERSION=0.13.1 diff --git a/nbproj/nbproject/project.xml b/nbproj/nbproject/project.xml index a4218a95..3ac2d061 100644 --- a/nbproj/nbproject/project.xml +++ b/nbproj/nbproject/project.xml @@ -11,7 +11,7 @@ .. ${project.dir}/build.xml - 1.7.5 + 1.7.6 0.13.1 diff --git a/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java b/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java index 6e4b4a31..cb0c7f52 100755 --- a/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java +++ b/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java @@ -50,7 +50,7 @@ public class GeneralProperties private static final String packageOfCellTypes = "ucl.physiol.neuroconstruct.cell"; - private static final String versionNumber = "1.7.5"; + private static final String versionNumber = "1.7.6"; //private static final String latestNeuroMLVersionNumber = "1.8.1";