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
76e93a4c
Commit
76e93a4c
authored
3 years ago
by
Juntong Liu
Browse files
Options
Downloads
Patches
Plain Diff
removed `sed -i /submodule/,24465d $(TOP)/.git/config` from DEFINES_FT
parent
4bf67062
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!57
E3-546: Address flaw in make init process
Pipeline
#99209
passed
3 years ago
Stage: check
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
configure/E3/DEFINES_FT
+0
-1
0 additions, 1 deletion
configure/E3/DEFINES_FT
with
1 addition
and
1 deletion
CHANGELOG.md
+
1
−
0
View file @
76e93a4c
...
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
...
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
*
Removed duplicated entries from generated
`.dep`
files
*
Removed duplicated entries from generated
`.dep`
files
### Other changes
### Other changes
*
removed
`sed -i /submodule/,24465d $(TOP)/.git/config`
from DEFINES_FT
*
removed
`e3.cfg`
,
`ess-env.conf`
and
`DEFINES_REQUIRE`
files and associated codes in
`RULES_REQUIRE`
,
`setE3Env.bash`
and
`.gitignore`
.
*
removed
`e3.cfg`
,
`ess-env.conf`
and
`DEFINES_REQUIRE`
files and associated codes in
`RULES_REQUIRE`
,
`setE3Env.bash`
and
`.gitignore`
.
*
removed legacy code from setE3Env.bash
*
removed legacy code from setE3Env.bash
*
Removed usage of
`env.sh`
- now there is a check only for seeing if the environment variable
`$IOCNAME`
is set
*
Removed usage of
`env.sh`
- now there is a check only for seeing if the environment variable
`$IOCNAME`
is set
...
...
This diff is collapsed.
Click to expand it.
configure/E3/DEFINES_FT
+
0
−
1
View file @
76e93a4c
# Keep always the module up-to-date
# Keep always the module up-to-date
define git_update =
define git_update =
git submodule deinit -f $@/
git submodule deinit -f $@/
sed -i '/submodule/,24465d' $(TOP)/.git/config
rm -rf $(TOP)/.git/modules/$@
rm -rf $(TOP)/.git/modules/$@
git submodule init $@/
git submodule init $@/
git submodule update --init --recursive $@/.
git submodule update --init --recursive $@/.
...
...
This diff is collapsed.
Click to expand it.
Simon Rose
@simonrose
mentioned in merge request
e3-base!59 (merged)
·
4 months ago
mentioned in merge request
e3-base!59 (merged)
mentioned in merge request e3-base!59
Toggle commit list
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