Skip to content
Snippets Groups Projects
Commit b5a815ce authored by Douglas Araujo's avatar Douglas Araujo
Browse files

Merge branch '2024q1-rc1' into 'master'

E3-1388: 2024q1-rc1

See merge request !157
parents ebbaa4f6 aa4ba867
No related branches found
Tags 7.0.8-5.1.0/5.1.0-b5a815c-20240123T125212
1 merge request!157E3-1388: 2024q1-rc1
Pipeline #173137 passed
---
variables:
E3_MODULE_LIST: "autosave caputlog recsync iocstats essioc"
E3_CI_BASE_VERSION: "7.0.7-37d472c"
E3_CI_BASE_VERSION: "7.0.8-b4af458"
stages:
- check
......@@ -13,11 +13,11 @@ default:
- docker
image: registry.esss.lu.se/ics-docker/centos-e3:latest
run pre-commit:
stage: check
image: registry.esss.lu.se/ics-docker/pre-commit:latest
script:
- pre-commit run --all-files
include:
- project: "ics-infrastructure/gitlab-ci-yml"
file: "PreCommit.gitlab-ci.yml"
run-pre-commit:
allow_failure: true
shellcheck:
......
......@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [5.1.0]
### New Features
* Allow for module-specific build rules (see: sequencer) to be installed and used
......@@ -222,7 +224,8 @@ of course pin a specific module version. If they do not, then the highest numeri
startup script
[Unreleased]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/5.0.0...master
[Unreleased]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/5.1.0...master
[5.1.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/5.0.0...5.1.0
[5.0.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/4.0.0...5.0.0
[4.0.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/3.4.1...4.0.0
[3.4.1]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/3.4.0...3.4.1
......
EPICS_BASE=/epics/base-7.0.7
EPICS_BASE=/epics/base-7.0.8
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=5.0.0
E3_REQUIRE_VERSION:=5.1.0
# The definitions shown below can also be placed in an untracked RELEASE.local
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment