Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
5322a3a0
Commit
5322a3a0
authored
Feb 14, 2018
by
Matthew Brett
Browse files
Refactor fix to env_vars.sh location
[skip ci]
parent
b065fa47
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
docker_build_wrap.sh
docker_build_wrap.sh
+4
-4
No files found.
docker_build_wrap.sh
View file @
5322a3a0
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
# BUILD_DEPENDS (may be used by config.sh, can be empty)
# BUILD_DEPENDS (may be used by config.sh, can be empty)
set
-e
set
-e
# Change into root directory of repo
cd
/io
# Unicode width, default 32
# Unicode width, default 32
UNICODE_WIDTH
=
${
UNICODE_WIDTH
:-
32
}
UNICODE_WIDTH
=
${
UNICODE_WIDTH
:-
32
}
...
@@ -18,7 +21,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
...
@@ -18,7 +21,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
CONFIG_PATH
=
${
CONFIG_PATH
:-
config
.sh
}
CONFIG_PATH
=
${
CONFIG_PATH
:-
config
.sh
}
# Path is relative to repository from which we ran
# Path is relative to repository from which we ran
ENV_VARS_PATH
=
"/io/
${
ENV_VARS_PATH
:-
env_vars
.sh
}
"
ENV_VARS_PATH
=
${
ENV_VARS_PATH
:-
env_vars
.sh
}
# Always pull in common and library builder utils
# Always pull in common and library builder utils
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
...
@@ -35,9 +38,6 @@ fi
...
@@ -35,9 +38,6 @@ fi
# Set PATH for chosen Python, Unicode width
# Set PATH for chosen Python, Unicode width
export
PATH
=
"
$(
cpython_path
$PYTHON_VERSION
$UNICODE_WIDTH
)
/bin:
$PATH
"
export
PATH
=
"
$(
cpython_path
$PYTHON_VERSION
$UNICODE_WIDTH
)
/bin:
$PATH
"
# Change into root directory of repo
cd
/io
# Configuration for this package, possibly overriding `build_wheel` defined in
# Configuration for this package, possibly overriding `build_wheel` defined in
# `common_utils.sh` via `manylinux_utils.sh`.
# `common_utils.sh` via `manylinux_utils.sh`.
source
"
$CONFIG_PATH
"
source
"
$CONFIG_PATH
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment