Skip to content

Commit a9846b5

Browse files
committed
cleanup, use QUIET_MAKE since the log is too long for travis
1 parent 55c82eb commit a9846b5

File tree

2 files changed

+3
-46
lines changed

2 files changed

+3
-46
lines changed

ci-before-build.sh

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# Most of the content in this file comes from https://github.com/multi-build/multibuild, with some modifications
55
# Follow the license below
66

7-
8-
97
# .. _license:
108

119
# *********************
@@ -41,9 +39,6 @@
4139
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
4240
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4341

44-
45-
46-
#! /bin/bash
4742
set -xe
4843

4944
if [[ "$NIGHTLY" = "true" ]]; then
@@ -55,40 +50,6 @@ if [[ "$NIGHTLY" = "true" ]]; then
5550
sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
5651
fi
5752

58-
59-
#!/bin/bash
60-
# Utilities for both OSX and Docker Linux
61-
# python or python3 should be on the PATH
62-
63-
# Only source common_utils once
64-
if [ -n "$COMMON_UTILS_SOURCED" ]; then
65-
return
66-
fi
67-
COMMON_UTILS_SOURCED=1
68-
69-
# Turn on exit-if-error
70-
set -e
71-
72-
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
73-
DOWNLOADS_SDIR=downloads
74-
PYPY_URL=https://downloads.python.org/pypy
75-
76-
if [ $(uname) == "Darwin" ]; then
77-
IS_MACOS=1; IS_OSX=1;
78-
else
79-
# In the manylinux_2_24 image, based on Debian9, "python" is not installed
80-
# so link in something for the various system calls before PYTHON_EXE is set
81-
which python || export PATH=/opt/python/cp39-cp39/bin:$PATH
82-
83-
if [ "$MB_ML_LIBC" == "musllinux" ]; then
84-
IS_ALPINE=1;
85-
MB_ML_VER=${MB_ML_VER:-"_1_2"}
86-
else
87-
# Default Manylinux version
88-
MB_ML_VER=${MB_ML_VER:-2014}
89-
fi
90-
fi
91-
9253
# Work round bug in travis xcode image described at
9354
# https://github.com/direnv/direnv/issues/210
9455
shell_session_update() { :; }
@@ -103,4 +64,5 @@ unset -f popd
10364
# Build OpenBLAS
10465
source build-openblas.sh
10566

67+
# Build wheel
10668
source tools/build_prepare.sh

tools/build_steps.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,13 @@ function before_build {
4949

5050
function clean_code {
5151
set -ex
52-
# Copied from common_utils.sh, with added debugging
5352
local build_commit=$1
5453
[ -z "$build_commit" ] && echo "build_commit not defined" && exit 1
5554
pushd OpenBLAS
5655
git fetch origin --tags
57-
echo after git fetch origin
5856
git checkout $build_commit
59-
echo after git checkout $build_commit
6057
git clean -fxd
61-
echo after git clean
6258
git submodule update --init --recursive
63-
echo after git submodule update
6459
popd
6560
}
6661

@@ -204,14 +199,14 @@ function do_build_lib {
204199
fi
205200
if [ -n "$dynamic_list" ]; then
206201
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
207-
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
202+
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
208203
USE_OPENMP=0 NUM_THREADS=64 \
209204
DYNAMIC_LIST="$dynamic_list" \
210205
BINARY="$bitness" $interface_flags \
211206
TARGET="$target"
212207
else
213208
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
214-
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
209+
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
215210
USE_OPENMP=0 NUM_THREADS=64 \
216211
BINARY="$bitness" $interface_flags \
217212
TARGET="$target"

0 commit comments

Comments
 (0)