Skip to content
Snippets Groups Projects
Commit 5c0ced20 authored by Wayne Lewis's avatar Wayne Lewis
Browse files

Merge branch '202103-e3-env' into 'master'

Updates for new e3 environment - base 7.0.5, require 3.4.0

See merge request e3/common/e3-MCoreUtils!1
parents d5382497 4a83c139
No related branches found
No related tags found
1 merge request!1Updates for new e3 environment - base 7.0.5, require 3.4.0
Pipeline #69283 passed with stages
in 40 seconds
---
include: 'https://gitlab.esss.lu.se/ics-infrastructure/gitlab-ci-yml/raw/master/E3ModuleBuild.gitlab-ci.yml'
default:
image: registry.esss.lu.se/ics-docker/centos-e3:0.2.0
#
EPICS_BASE:=/epics/base-7.0.4
EPICS_BASE:=/epics/base-7.0.5
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.3.0
E3_REQUIRE_VERSION:=3.4.0
# The definitions shown below can also be placed in an untracked RELEASE.local
-include $(TOP)/../../RELEASE.local
......
#
EPICS_BASE=/epics/base-3.15.5
EPICS_BASE=/epics/base-7.0.5
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.0.4
E3_REQUIRE_VERSION:=3.4.0
# The definitions shown below can also be placed in an untracked RELEASE_DEV.local
-include $(TOP)/../../RELEASE_DEV.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