Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.admin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
bob
bob.admin
Commits
82cbd93d
Commit
82cbd93d
authored
8 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
Switch variable name to avoid conflict with conda setup
parent
7d917eda
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gitlab/functions.sh
+4
-4
4 additions, 4 deletions
gitlab/functions.sh
with
4 additions
and
4 deletions
gitlab/functions.sh
+
4
−
4
View file @
82cbd93d
...
@@ -202,8 +202,8 @@ if [ -z "${CONDA_FOLDER}" ]; then
...
@@ -202,8 +202,8 @@ if [ -z "${CONDA_FOLDER}" ]; then
CONDA_FOLDER
=
/opt/conda
CONDA_FOLDER
=
/opt/conda
fi
fi
if
[
-z
"
${
CONDA_PREFIX
}
"
]
;
then
if
[
-z
"
${
VIRTUALENV_PATH
}
"
]
;
then
CONDA_PREFIX
=
env
VIRTUALENV_PATH
=
env
fi
fi
if
[
-z
"
${
DOCSERVER
}
"
]
;
then
if
[
-z
"
${
DOCSERVER
}
"
]
;
then
...
@@ -211,7 +211,7 @@ if [ -z "${DOCSERVER}" ]; then
...
@@ -211,7 +211,7 @@ if [ -z "${DOCSERVER}" ]; then
export_env DOCSERVER
export_env DOCSERVER
fi
fi
PREFIX
=
${
CI_PROJECT_DIR
}
/
${
CONDA_PREFIX
}
PREFIX
=
${
CI_PROJECT_DIR
}
/
${
VIRTUALENV_PATH
}
if
[
"
${
ARCH
}
"
==
"linux"
]
;
then
if
[
"
${
ARCH
}
"
==
"linux"
]
;
then
# Temporary hack to get building done right with gcc-5 compilers
# Temporary hack to get building done right with gcc-5 compilers
...
@@ -252,7 +252,7 @@ check_env DOCSERVER
...
@@ -252,7 +252,7 @@ check_env DOCSERVER
check_env PYPISERVER
check_env PYPISERVER
check_env TESTSERVER
check_env TESTSERVER
check_env CONDA_FOLDER
check_env CONDA_FOLDER
check_env
CONDA_PREFIX
check_env
VIRTUALENV_PATH
export_env LD_LIBRARY_PATH
export_env LD_LIBRARY_PATH
export_env BOB_PREFIX_PATH
export_env BOB_PREFIX_PATH
...
...
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