Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.devtools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
bob
bob.devtools
Commits
d8b547d4
Commit
d8b547d4
authored
5 years ago
by
André Anjos
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-47-ripgrep-hack-removal' into 'master'
Remove hacks for ripgrep issue (closes
#47
) Closes
#47
See merge request
!134
parents
a2bf75bb
66d4591e
No related branches found
No related tags found
1 merge request
!134
Remove hacks for ripgrep issue (closes #47)
Pipeline
#35981
passed
5 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bob/devtools/bootstrap.py
+0
-26
0 additions, 26 deletions
bob/devtools/bootstrap.py
bob/devtools/scripts/build.py
+0
-5
0 additions, 5 deletions
bob/devtools/scripts/build.py
with
0 additions
and
31 deletions
bob/devtools/bootstrap.py
+
0
−
26
View file @
d8b547d4
...
...
@@ -48,28 +48,6 @@ import logging
logger
=
logging
.
getLogger
(
__name__
)
def
do_hack
(
project_dir
):
"""
This function is supposed to be for temporary usage.
It implements hacks for the issue:
https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112
"""
#### HACK to avoid ripgrep ignoring bin/ directories in our checkouts
import
shutil
git_ignore_file
=
os
.
path
.
join
(
project_dir
,
"
.gitignore
"
)
if
os
.
path
.
exists
(
git_ignore_file
):
logger
.
warning
(
"
Removing .gitignore to avoid issue with ripgrep (see
"
"
https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112)
"
)
os
.
unlink
(
git_ignore_file
)
#### END OF HACK
def
set_environment
(
name
,
value
,
env
=
os
.
environ
):
"""
Function to setup the environment variable and print debug message.
...
...
@@ -462,10 +440,6 @@ if __name__ == "__main__":
setup_logger
(
logger
,
args
.
verbose
)
# Run conda-build hacks
# TODO: Remove this hack as soon as possible
do_hack
(
"
.
"
)
condarc
=
os
.
path
.
join
(
args
.
conda_root
,
"
condarc
"
)
install_miniconda
(
args
.
conda_root
,
args
.
name
)
...
...
This diff is collapsed.
Click to expand it.
bob/devtools/scripts/build.py
+
0
−
5
View file @
d8b547d4
...
...
@@ -190,12 +190,7 @@ def build(
group
,
)
#### HACK to avoid ripgrep ignoring bin/ directories in our checkouts
# TODO: Remove this hack as soon as possible
from
bob.devtools.bootstrap
import
do_hack
project_dir
=
os
.
path
.
dirname
(
recipe_dir
[
0
])
do_hack
(
project_dir
)
# get potential channel upload and other auxiliary channels
channels
=
get_channels
(
...
...
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