Skip to content

Commit 15115eb

Browse files
stefanseefeldstefanseefeld
committed
Fix appveyor build failures.
1 parent 1727b67 commit 15115eb

File tree

4 files changed

+53
-52
lines changed

4 files changed

+53
-52
lines changed

‎.appveyor.yml‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,35 @@ environment:
44
# /E:ON and /V:ON options are not enabled in the batch script intepreter
55
# See: http://stackoverflow.com/a/13751649/163740
66
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"
7-
BOOST_PREFIX: C:\Libraries\boost_1_66_0
87

98
matrix:
109

1110
# Pre-installed Python versions, which Appveyor may upgrade to
1211
# a later point release.
1312
# See: http://www.appveyor.com/docs/installed-software#python
1413

15-
- PYTHON: "C:\\Python27"
16-
PYTHON_VERSION: "2.7.x" # currently 2.7.9
17-
PYTHON_ARCH: "32"
18-
MSVC: "14.0"
19-
ARCH: x86
20-
21-
- PYTHON: "C:\\Python36-x64"
22-
PYTHON_VERSION: "3.6.x"
23-
PYTHON_ARCH: "64"
24-
MSVC: "12.0"
14+
- PYTHON: C:\\Python36-x64
15+
PYTHON_VERSION: 3.6.x
16+
PYTHON_ARCH: 64
17+
MSVC: 12.0
2518
ARCH: x86_64
19+
BOOST_PREFIX: C:\Libraries\boost_1_66_0
2620

2721
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
28-
PYTHON: "C:\\Python36-x64"
29-
PYTHON_VERSION: "3.6.x"
30-
PYTHON_ARCH: "64"
31-
MSVC: "14.13.26128"
22+
PYTHON: C:\\Python36-x64
23+
PYTHON_VERSION: 3.6.x
24+
PYTHON_ARCH: 64
25+
MSVC: 15.9.19
26+
ARCH: x86_64
27+
BOOST_PREFIX: C:\Libraries\boost_1_69_0
28+
29+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
30+
PYTHON: C:\\Python36-x64
31+
PYTHON_VERSION: 3.6.x
32+
PYTHON_ARCH: 64
33+
MSVC: 16.6.5
3234
ARCH: x86_64
35+
BOOST_PREFIX: C:\Libraries\boost_1_73_0
3336

3437
install:
3538
# If there is a newer build queued for the same PR, cancel this one.
@@ -64,28 +67,33 @@ install:
6467

6568
# Upgrade to the latest version of pip to avoid it displaying warnings
6669
# about it being out of date.
67-
- "pip install --disable-pip-version-check --user --upgrade pip"
70+
- "python -m pip install --disable-pip-version-check --user --upgrade pip"
6871

6972
# Install the build dependencies of the project. If some dependencies contain
7073
# compiled extensions and are not provided as pre-built wheel packages,
7174
# pip will build them from source using the MSVC compiler matching the
7275
# target Python version and architecture
73-
- |
74-
curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2018-04-08.tar.gz
75-
tar xf faber.tar.gz
76-
CD faber-snapshot-2018-04-08
77-
python setup.py install
78-
CD ..
76+
77+
- curl -LfsS -o vswhere.exe https://github.com/Microsoft/vswhere/releases/download/2.8.4/vswhere.exe
78+
#- |
79+
# curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2020-08-01.tar.gz
80+
# tar xf faber.tar.gz
81+
# CD faber-snapshot-2020-08-01
82+
# python setup.py install
83+
# CD ..
84+
- python -m pip install faber
7985
# report the available MSVC compilers
80-
- faber --info=tools cxx
86+
- faber --log=tools --info=tools cxx
8187
- easy_install sphinx
82-
- pip install numpy
88+
- python -m pip install numpy
89+
- set FARGS=--log=summary --log=output --log=actions --log=commands --with-boost-include=%BOOST_PREFIX% target.arch=%ARCH% cxx.name=msvc cxx.version=%MSVC%
8390

8491
build_script:
85-
- faber --with-boost-include=%BOOST_PREFIX% target.arch=%ARCH% msvc.version=%MSVC%
92+
- faber %FARGS% config || type config.log
93+
- faber %FARGS% -j8
8694

8795
test_script:
88-
- faber --with-boost-include=%BOOST_PREFIX% test.report target.arch=%ARCH% msvc.version=%MSVC%
96+
- faber %FARGS% -j8 test.report
8997

9098
after_test:
9199
# If tests are successful, create binary packages for the project.

‎.travis.yml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
# (See accompanying file LICENSE_1_0.txt or copy at
77
# http://www.boost.org/LICENSE_1_0.txt)
88

9-
sudo: required
10-
dist: trusty
9+
dist: bionic
1110

1211
language: cpp
1312

1413
env:
1514
global:
1615
- secure: BRNUkxN3p8f+uYKWC3Hr0VPqZA0PxbWr1DJlcI4hbiZtzKhMCWjDmd9UW9CzzexqeOxpd+9s0G87qvOur+wMSVxugDxtTesZrh1czXHeSVxgQrYD783XJtQJ9aYypbChkiboRD6Xpmbq7itwMuHBJMFtCuDxMynpU1jWwkyTf2Y=
1716

18-
matrix:
17+
jobs:
1918
include:
2019
- os: linux
2120
env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
@@ -40,9 +39,10 @@ addons:
4039
sources:
4140
- ubuntu-toolchain-r-test
4241
packages:
43-
- gcc-4.8
44-
- g++-4.8
42+
- gcc
43+
- g++
4544
- clang
45+
- python3-pip
4646
- python-numpy
4747
- python-sphinx
4848
- python3-dev
@@ -57,12 +57,6 @@ cache:
5757
directories:
5858
- $HOME/Boost
5959

60-
before_install:
61-
# The Trusty image has several Python versions pre-installed compiled with
62-
# conflicting UCS2 and UCS4 unicode. Modify the PATH to skip the TravisCI python.
63-
# See https://github.com/travis-ci/travis-ci/issues/4948 for details.
64-
- export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
65-
6660
install:
6761
# Install our own version of Boost (the subset we need) as the system version is
6862
# too old (for C++11 support).
@@ -83,15 +77,14 @@ install:
8377
echo "using cached Boost prerequisites."
8478
fi
8579
# Install Faber, the build tool.
86-
date=2018-04-08
87-
wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
88-
tar xf $date.tar.gz
89-
pushd faber-snapshot-$date
90-
#wget https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
91-
#tar xf 0.2.tar.gz
92-
#pushd faber-release-0.2
93-
sudo python setup.py install
94-
popd
80+
python3 -m pip install setuptools
81+
python3 -m pip install faber
82+
#date=2020-08-01
83+
#wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
84+
#tar xf $date.tar.gz
85+
#pushd faber-snapshot-$date
86+
#sudo python3 setup.py install
87+
#popd
9588
9689
before_script:
9790
- sed -e "s/\$PYTHON/$PYTHON/g" .ci/faber > ~/.faber
@@ -104,7 +97,7 @@ script:
10497
if [ "$DOC" ]; then
10598
BOOST_ROOT=$HOME/Boost faber --builddir=build doc.html
10699
else
107-
faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS
100+
faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS -j8
108101
fi
109102
110103
after_success:

‎fabscript‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ checks = [cxx_checks.has_cxx11(features, define('HAS_CXX11')),
7575
has_numpy(features)]
7676
config = report('config', checks)
7777

78-
src = module('src', features=config.use)
79-
test = module('test', features=config.use)
80-
doc = module('doc', features=config.use)
78+
src = module('src', features=features|config.use)
79+
test = module('test', features=features|config.use)
80+
doc = module('doc', features=features|config.use)
8181

8282
default = src.default

‎test/fabscript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ tests.append(extension_test('auto_ptr',
123123
import_ = binary('import_', ['import_.cpp', src.bpl], features=features|python_libs)
124124
if platform.os == 'Windows':
125125
command = """set PATH=$(runpath);%PATH%
126-
$(>[1]) $(>[2])"""
126+
$(>[0]) $(>[1])"""
127127
else:
128-
command = 'LD_LIBRARY_PATH=$(runpath) $(>[1]) $(>[2])'
128+
command = 'LD_LIBRARY_PATH=$(runpath) $(>[0]) $(>[1])'
129129

130130
tests.append(test('import', [import_, 'import_.py'],
131131
run=action('run', command),

0 commit comments

Comments
 (0)