Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESS EPICS Environment
wrappers
e3-require
Commits
557a4b3e
Commit
557a4b3e
authored
4 months ago
by
Douglas Araujo
Browse files
Options
Downloads
Plain Diff
Merge branch '2024q2' into 'master'
2024q2 See merge request
!183
parents
b7ea844c
e663d1dd
No related branches found
Branches containing commit
Tags
5.1.1
7.0.8.1-5.1.1/5.1.1-557a4b3-20240927T084841
1 merge request
!183
2024q2
Pipeline
#203635
passed
3 months ago
Stage: check
Stage: build
Stage: test
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
configure/RELEASE
+2
-2
2 additions, 2 deletions
configure/RELEASE
with
4 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
2
View file @
557a4b3e
---
variables
:
E3_CI_BASE_VERSION
:
"
7.0.8-NA/7.0.8
-d498b42-20240419T15214
1"
E3_CI_MODIFIED_BASE_VERSION
:
"
7.0.8
-d498b42-20240419T152141"
# strip the first part of the tag name - see E3-1529
E3_CI_BASE_VERSION
:
"
7.0.8
.1
-NA/7.0.8
.1-68332f4-20240917T14093
1"
E3_CI_MODIFIED_BASE_VERSION
:
"
7.0.8
.1-68332f4-20240917T140931"
stages
:
-
check
...
...
This diff is collapsed.
Click to expand it.
configure/RELEASE
+
2
−
2
View file @
557a4b3e
EPICS_BASE=/epics/base-7.0.8
EPICS_BASE=/epics/base-7.0.8
.1
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=5.1.
0
E3_REQUIRE_VERSION:=5.1.
1
# The definitions shown below can also be placed in an untracked RELEASE.local
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment