Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c69e05d

Browse filesBrowse files
skvarkskvark
committed
just disable ccache for i686
1 parent 1b9bf2b commit c69e05d
Copy full SHA for c69e05d

File tree

Expand file treeCollapse file tree

2 files changed

+16
-26
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+16
-26
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ jobs:
239239
- PLAT=i686
240240
- ENABLE_CONTRIB=0
241241
- ENABLE_HEADLESS=0
242+
- USE_CCACHE=0
242243
cache:
243244
directories: $HOME/.ccache
244245
- os: linux
@@ -262,6 +263,7 @@ jobs:
262263
- ENABLE_CONTRIB=0
263264
- ENABLE_HEADLESS=0
264265
- TEST_DEPENDS=numpy==1.11.3
266+
- USE_CCACHE=0
265267
cache:
266268
directories: $HOME/.ccache
267269
- os: linux
@@ -285,6 +287,7 @@ jobs:
285287
- ENABLE_CONTRIB=0
286288
- ENABLE_HEADLESS=0
287289
- TEST_DEPENDS=numpy==1.14.5
290+
- USE_CCACHE=0
288291
cache:
289292
directories: $HOME/.ccache
290293
- os: linux
@@ -308,6 +311,7 @@ jobs:
308311
- ENABLE_CONTRIB=0
309312
- ENABLE_HEADLESS=0
310313
- TEST_DEPENDS=numpy==1.17.3
314+
- USE_CCACHE=0
311315
cache:
312316
directories: $HOME/.ccache
313317

@@ -331,6 +335,7 @@ jobs:
331335
- PLAT=i686
332336
- ENABLE_CONTRIB=0
333337
- ENABLE_HEADLESS=1
338+
- USE_CCACHE=0
334339
cache:
335340
directories: $HOME/.ccache
336341
- os: linux
@@ -354,6 +359,7 @@ jobs:
354359
- ENABLE_CONTRIB=0
355360
- ENABLE_HEADLESS=1
356361
- TEST_DEPENDS=numpy==1.11.3
362+
- USE_CCACHE=0
357363
cache:
358364
directories: $HOME/.ccache
359365
- os: linux
@@ -377,6 +383,7 @@ jobs:
377383
- ENABLE_CONTRIB=0
378384
- ENABLE_HEADLESS=1
379385
- TEST_DEPENDS=numpy==1.14.5
386+
- USE_CCACHE=0
380387
cache:
381388
directories: $HOME/.ccache
382389
- os: linux
@@ -400,6 +407,7 @@ jobs:
400407
- ENABLE_CONTRIB=0
401408
- ENABLE_HEADLESS=1
402409
- TEST_DEPENDS=numpy==1.17.3
410+
- USE_CCACHE=0
403411
cache:
404412
directories: $HOME/.ccache
405413

@@ -423,6 +431,7 @@ jobs:
423431
- PLAT=i686
424432
- ENABLE_CONTRIB=1
425433
- ENABLE_HEADLESS=0
434+
- USE_CCACHE=0
426435
cache:
427436
directories: $HOME/.ccache
428437
- os: linux
@@ -446,6 +455,7 @@ jobs:
446455
- TEST_DEPENDS=numpy==1.11.3
447456
- ENABLE_CONTRIB=1
448457
- ENABLE_HEADLESS=0
458+
- USE_CCACHE=0
449459
cache:
450460
directories: $HOME/.ccache
451461
- os: linux
@@ -469,6 +479,7 @@ jobs:
469479
- TEST_DEPENDS=numpy==1.14.5
470480
- ENABLE_CONTRIB=1
471481
- ENABLE_HEADLESS=0
482+
- USE_CCACHE=0
472483
cache:
473484
directories: $HOME/.ccache
474485
- os: linux
@@ -492,6 +503,7 @@ jobs:
492503
- TEST_DEPENDS=numpy==1.17.3
493504
- ENABLE_CONTRIB=1
494505
- ENABLE_HEADLESS=0
506+
- USE_CCACHE=0
495507
cache:
496508
directories: $HOME/.ccache
497509

@@ -516,6 +528,7 @@ jobs:
516528
- PLAT=i686
517529
- ENABLE_CONTRIB=1
518530
- ENABLE_HEADLESS=1
531+
- USE_CCACHE=0
519532
cache:
520533
directories: $HOME/.ccache
521534
- os: linux
@@ -539,6 +552,7 @@ jobs:
539552
- TEST_DEPENDS=numpy==1.11.3
540553
- ENABLE_CONTRIB=1
541554
- ENABLE_HEADLESS=1
555+
- USE_CCACHE=0
542556
cache:
543557
directories: $HOME/.ccache
544558
- os: linux
@@ -562,6 +576,7 @@ jobs:
562576
- TEST_DEPENDS=numpy==1.14.5
563577
- ENABLE_CONTRIB=1
564578
- ENABLE_HEADLESS=1
579+
- USE_CCACHE=0
565580
cache:
566581
directories: $HOME/.ccache
567582
- os: linux
@@ -585,6 +600,7 @@ jobs:
585600
- TEST_DEPENDS=numpy==1.17.3
586601
- ENABLE_CONTRIB=1
587602
- ENABLE_HEADLESS=1
603+
- USE_CCACHE=0
588604
cache:
589605
directories: $HOME/.ccache
590606

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
-26Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,6 @@
55
#See multibuild/README.rst
66
echo "=== Loading config.sh === "
77

8-
# custom ccache install because manylinux2014 i686 does not have ccache package
9-
function activate_ccache {
10-
# Link up the correct location for ccache
11-
mkdir -p /parent-home/.ccache
12-
ln -s /parent-home/.ccache $HOME/.ccache
13-
14-
# Now install ccache
15-
if [ "$(get_platform)" == x86_64 ]; then
16-
suppress yum_install ccache
17-
fi
18-
19-
# Create fake compilers and prepend them to the PATH
20-
# Note that yum is supposed to create these for us,
21-
# but I had trouble finding them
22-
local ccache_dir=/usr/lib/ccache/compilers
23-
mkdir -p $ccache_dir
24-
ln -s /usr/bin/ccache $ccache_dir/gcc
25-
ln -s /usr/bin/ccache $ccache_dir/g++
26-
ln -s /usr/bin/ccache $ccache_dir/cc
27-
ln -s /usr/bin/ccache $ccache_dir/c++
28-
export PATH=$ccache_dir:$PATH
29-
30-
# Prove to the developer that ccache is activated
31-
echo "Using C compiler: $(which gcc)"
32-
}
33-
348
# To see build progress
359
function build_wheel {
3610
build_bdist_wheel $@

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.