Merge remote-tracking branch 'origin/master' into Ticket8614_mercury_IPS_magnet_supply

Author: Tom-Willemsen

.github/workflows/lint.yml

@@ -4,8 +4,8 @@ jobs:
   check-opi-format:
     runs-on: "windows-latest"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       - name: OPI checker dependencies
@@ -18,8 +18,8 @@ jobs:
   check-build:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       - name: Run check_build
@@ -29,8 +29,8 @@ jobs:
   scriptgenerator-tests:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       - name: Install dependencies
@@ -42,8 +42,8 @@ jobs:
   checkstyle:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -64,14 +64,14 @@ jobs:
     permissions:
       security-events: write
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
-      - uses: github/codeql-action/init@v3
+      - uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.buildmode }}
           queries: +security-and-quality
-      - uses: github/codeql-action/analyze@v3
+      - uses: github/codeql-action/analyze@v4

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
 
   // agent defines where the pipeline will run.
   agent {  
-    label "${params.LABEL}"
+    label "gui"
   }
 
   environment {

Jenkinsfile_linux

@@ -82,35 +82,6 @@ pipeline {
             """
       }
     }
-    
-//    stage("OPI Checker") {
-//      steps {
-//        bat """
-//            set PYTHON3=C:\\Instrument\\Apps\\Python3\\python.exe
-//            %PYTHON3% .\\base\\uk.ac.stfc.isis.ibex.opis\\check_opi_format.py -strict 
-//        """
-//      }
-//    }
-    
-//     stage("Collate Unit Tests") {
-//       steps {
-//         junit '**/surefire-reports/TEST-*.xml,**/test-reports/TEST-*.xml'
-//       }
-//     }
-    
-    stage("Checkstyle") {
-      steps {
-        archiveCheckstyleResults()
-      }
-    }
-    
- //   stage("Doxygen") {
- //     steps {
-//        bat '''
-//            "C:\\Program Files\\doxygen\\bin\\doxygen.exe" build\\ibex_gui_doxy.config
-//            '''
- //     }
-//    }
   }
 }
 

base/uk.ac.stfc.isis.ibex.nicos/src/uk/ac/stfc/isis/ibex/nicos/NicosModel.java

@@ -88,7 +88,9 @@ public class NicosModel extends ModelObject {
     private long lastEntryTime;
     private List<QueuedScript> queuedScripts = new ArrayList<>();
 
-	private NicosErrorState error = NicosErrorState.NO_ERROR;
+    // Start with a 'connection failed' error. This will get cleared when
+    // a successful connection gets made.
+	private NicosErrorState error = NicosErrorState.CONNECTION_FAILED;
 
     /**
      * Default constructor.