Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/deployment/Creating-a-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ is recent enough to include the most recent changes in the

1. Do the same for the `EPICS32` 32-bit build, replacing `EPICS` with `EPICS32` everywhere in the commands above.
1. Check release is now listed in [`https://control-svcs.isis.cclrc.ac.uk/git/?a=project_list;pf=releases`](https://control-svcs.isis.cclrc.ac.uk/git/?a=project_list;pf=releases)
1. Run the [`instrument_deploy.yaml` ansible playbook](https://github.com/ISISComputingGroup/ansible-playbooks/tree/main?tab=readme-ov-file#instrument_deployyaml) which currently installs the JDK on instruments.


{#creating_release_testing_steps}
### Testing
Expand Down
4 changes: 1 addition & 3 deletions doc/overview/First-Time-Build.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ See [Install Visual Studio](/iocs/compiling/Install-Visual-Studio)
{#first_time_install_java}
## Install Java JDK

Install **OpenJDK 21 hotspot** from https://adoptium.net/?variant=openjdk21&jvmVariant=hotspot (the MSI installer is fine, tick all the boxes when it asks you which components to install)
Install the **OpenJDK 25 hotspot** binary zip from https://adoptium.net and extract to `\instrument\apps\JDK\25`

```{important}
**Do not install an Oracle JDK**. It has an unsuitable license.
```

You may wish to install some optional java components [as detailed here](#developer_upgrade_java).

{#first_time_install_maven}
## Install Maven

Expand Down
6 changes: 3 additions & 3 deletions doc/processes/dev_processes/Dependency-Updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ In `create_icp_binaries.bat`, update the unpacked version of MySQL used during t
In `c:\instrument\apps\epics\support\mysql\master\MySQLCppApp\src\mysql-connector-c++`, update the vendor submodule to a recent version, then rebuild `mysql`, `pvdump`, and then all IOCs, in that order.

### Java
- Get the latest AdoptOpen JDK msi file from `https://adoptium.net/releases.html?jvmVariant=hotspot` and put it in `\\isis\shares\ISIS_Experiment_Controls_Public\third_party_installers\latest_versions`.
- Get the latest AdoptOpen JDK zip file from `https://adoptium.net/releases.html?jvmVariant=hotspot` and put it in `C:\instrument\apps\JDK\<majorver>\`.
* Only upgrade major versions to another LTS version.
- Copy the older version onto the `\\isis\shares\ISIS_Experiment_Controls_Public\third_party_installers\old_versions`.
- Uninstall the older version from control Panel and install the new version.
- Uninstall the older version from control Panel, remove any references from the `PATH` environment variable.
- Test that running `start_ibex_server.bat` completes successfully, and ensure there are no obvious errors in the IOC log files for:
* ARBLOCK
* ARINST
* ALARM
* IOCLOG
- Check that CS Studio IDE is loaded correctly
- Update the Ansible playbook with the new version as per [these instructions](https://github.com/ISISComputingGroup/ansible-playbooks/tree/main?tab=readme-ov-file#updating-jdk-version).

### Maven
- There are two versions of maven, this is to update the one following the format `maven-X.x.x`
Expand Down