Skip to content

Commit aaa0dfa

Browse files
committed
Merge remote-tracking branch 'origin/master' into Ticket8445_release_notes
2 parents cc686af + c2b8a7c commit aaa0dfa

6 files changed

Lines changed: 398 additions & 95 deletions

File tree

.github/ISSUE_TEMPLATE/generic-all-instrument-template.md

Lines changed: 66 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -36,178 +36,187 @@ assignees: ''
3636

3737
## TS2
3838

39-
- ### SANS2D
39+
- ### NDXSANS2D
4040
- [ ] Started
4141
- [ ] Completed
42-
- ### WISH
42+
- ### NDXWISH
4343
- [ ] Started
4444
- [ ] Completed
45-
- ### WISH_SETUP
45+
- ### NDXWISH_SETUP
4646
- [ ] Started
4747
- [ ] Completed
48-
- ### IMAT
48+
- ### NDXIMAT
4949
- [ ] Started
5050
- [ ] Completed
51-
- ### INTER
51+
- ### NDXINTER
5252
- [ ] Started
5353
- [ ] Completed
54-
- ### LARMOR
54+
- ### NDXLARMOR
5555
- [ ] Started
5656
- [ ] Completed
57-
- ### LET
57+
- ### NDXLET
5858
- [ ] Started
5959
- [ ] Completed
60-
- ### NIMROD
60+
- ### NDXNIMROD
6161
- [ ] Started
6262
- [ ] Completed
63-
- ### POLREF
63+
- ### NDXPOLREF
6464
- [ ] Started
6565
- [ ] Completed
66-
- ### ZOOM
66+
- ### NDXZOOM
6767
- [ ] Started
6868
- [ ] Completed
69-
- ### CHIPIR
69+
- ### NDXCHIPIR
7070
- [ ] Started
7171
- [ ] Completed
72-
- ### OFFSPEC
72+
- ### NDXOFFSPEC
7373
- [ ] Started
7474
- [ ] Completed
7575

7676
## TS1
77-
- ### ENGINX
77+
- ### NDXENGINX
7878
- [ ] Started
7979
- [ ] Completed
80-
- ### CRISP
80+
- ### NDXCRISP
8181
- [ ] Started
8282
- [ ] Completed
83-
- ### SURF
83+
- ### NDXSURF
8484
- [ ] Started
8585
- [ ] Completed
86-
- ### LOQ
86+
- ### NDXLOQ
8787
- [ ] Started
8888
- [ ] Completed
89-
- ### GEM
89+
- ### NDXGEM
9090
- [ ] Started
9191
- [ ] Completed
92-
- ### HRPD
92+
- ### NDXHRPD
9393
- [ ] Started
9494
- [ ] Completed
95-
- ### INES
95+
- ### NDXINES
9696
- [ ] Started
9797
- [ ] Completed
98-
- ### PEARL
98+
- ### NDXPEARL
9999
- [ ] Started
100100
- [ ] Completed
101-
- ### POLARIS
101+
- ### NDXPOLARIS
102102
- [ ] Started
103103
- [ ] Completed
104-
- ### SXD
104+
- ### NDXSXD
105105
- [ ] Started
106106
- [ ] Completed
107-
- ### EMMA
107+
- ### NDXEMMA-A
108108
- [ ] Started
109109
- [ ] Completed
110-
- ### ARGUS
110+
- ### NDXEMMA-B
111111
- [ ] Started
112112
- [ ] Completed
113-
- ### CHRONUS
113+
- ### NDXARGUS
114114
- [ ] Started
115115
- [ ] Completed
116-
- ### EMU
116+
- ### NDXCHRONUS
117117
- [ ] Started
118118
- [ ] Completed
119-
- ### HIFI
119+
- ### NDXEMU
120120
- [ ] Started
121121
- [ ] Completed
122-
- ### MUSR
122+
- ### NDXHIFI
123123
- [ ] Started
124124
- [ ] Completed
125-
- ### MUONFE
125+
- ### NDXMUSR
126126
- [ ] Started
127127
- [ ] Completed
128-
- ### RIKENFE
128+
- ### NDXMUONFE
129129
- [ ] Started
130130
- [ ] Completed
131-
- ### OSIRIS
131+
- ### NDXRIKENFE
132132
- [ ] Started
133133
- [ ] Completed
134-
- ### IRIS
134+
- ### NDXOSIRIS
135135
- [ ] Started
136136
- [ ] Completed
137-
- ### TOSCA
137+
- ### NDXIRIS
138138
- [ ] Started
139139
- [ ] Completed
140-
- ### VESUVIO
140+
- ### NDXTOSCA
141141
- [ ] Started
142142
- [ ] Completed
143-
- ### ALF
143+
- ### NDXVESUVIO
144144
- [ ] Started
145145
- [ ] Completed
146-
- ### MAPS
146+
- ### NDXALF
147147
- [ ] Started
148148
- [ ] Completed
149-
- ### MARI
149+
- ### NDXMAPS
150150
- [ ] Started
151151
- [ ] Completed
152-
- ### MERLIN
152+
- ### NDXMARI
153153
- [ ] Started
154154
- [ ] Completed
155-
- ### SANDALS
155+
- ### NDXMERLIN
156156
- [ ] Started
157157
- [ ] Completed
158-
- ### ENGINX_SETUP
158+
- ### NDXSANDALS
159159
- [ ] Started
160160
- [ ] Completed
161-
- ### ENGINX-STRESS1
161+
- ### NDXMUX
162+
- [ ] Started
163+
- [ ] Completed
164+
- ### NDXENGINX_SETUP
162165
- [ ] Started
163166
- [ ] Completed
164-
- ### HRPD_SETUP
167+
- ### ENGINX-STRESS1
165168
- [ ] Started
166169
- [ ] Completed
167-
- ### PEARL_SETUP
170+
- ### NDXHRPD_SETUP
168171
- [ ] Started
169172
- [ ] Completed
170-
- ### HIFI_CRYOMAG
173+
- ### NDXPEARL_SETUP
171174
- [ ] Started
172175
- [ ] Completed
173-
- ### IRIS_SETUP
176+
- ### NDXHIFI-CRYOMAG
174177
- [ ] Started
175178
- [ ] Completed
176-
- ### SMUONFE
179+
- ### NDXIRIS_SETUP
177180
- [ ] Started
178181
- [ ] Completed
179182

180183
## Pseudo Instruments
181-
- ### SELAB
184+
- ### NDXSELAB
185+
- [ ] Started
186+
- [ ] Completed
187+
- ### NDXSELAB2
188+
- [ ] Started
189+
- [ ] Completed
190+
- ### NDXSOFTMAT
182191
- [ ] Started
183192
- [ ] Completed
184-
- ### SOFTMAT
193+
- ### NDXSCIDEMO
185194
- [ ] Started
186195
- [ ] Completed
187-
- ### SCIDEMO
196+
- ### NDXDCLAB
188197
- [ ] Started
189198
- [ ] Completed
190-
- ### DCLAB
199+
- ### NDXMOTION
191200
- [ ] Started
192201
- [ ] Completed
193-
- ### MOTION
202+
- ### NDXIBEXGUITEST
194203
- [ ] Started
195204
- [ ] Completed
196-
- ### IBEXGUITEST
205+
- ### NDXDETECT1
197206
- [ ] Started
198207
- [ ] Completed
199-
- ### DETECT1
208+
- ### NDXDETECT2
200209
- [ ] Started
201210
- [ ] Completed
202-
- ### DETECT2
211+
- ### NDXDETECT3
203212
- [ ] Started
204213
- [ ] Completed
205-
- ### CRYOLAB-R80
214+
- ### NDXCRYOLAB_R80
206215
- [ ] Started
207216
- [ ] Completed
208-
- ### DETMON
217+
- ### NDADETMON
209218
- [ ] Started
210219
- [ ] Completed
211220

212221

213-
[Back to Top](#instrument-checklist)
222+
[Back to Top](#instrument-checklist)

.github/workflows/project_board_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ jobs:
1212
run: |
1313
output=$(curl -s --location --fail https://dataweb2.isis.rl.ac.uk/projectboardchecks)
1414
echo $output | jq -r '.details[]'
15-
echo $output | jq -er '.details | length == 0'
15+
echo $output | jq -er 'isempty(.details[] | select(startswith("ERROR")))'
1616
shell: bash

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.idea/
2+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Please see the [Project Board](https://github.com/orgs/ISISComputingGroup/projec
88

99
### [Latest Stable IBEX Version (25.8.0)](release_notes/Release-Notes-v25.8.0.md)
1010

11-
[Upcoming Release](release_notes/Release-Notes-26.2.0.md)
11+
[Upcoming Release](release_notes/Release-Notes-v26.2.0.md)
1212

1313
[Previous Releases](docs/all-releases.md)
1414

0 commit comments

Comments
 (0)