Skip to content

Commit e0dab63

Browse files
committed
CI fixes
This enables Linux testing on Appveyor, fixes .NET installation on Travis and adds the ability to test on multiple Python versions (although 3.7 testing is not enabled yet). Fixes: #169 Issue: #166
1 parent aa7909d commit e0dab63

13 files changed

+96
-31
lines changed

.ci/appveyor_find_python.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
3+
for d in $(ls -d /home/appveyor/venv${PYTHON_VERSION}*/bin/ | sort -nr); do
4+
echo "${d}"
5+
exit 0
6+
done
7+
8+
echo "Could not find Python version ${PYTHON_VERSION}" >&2
9+
exit 1

.ci/appveyor_run_tests.ps1

Lines changed: 0 additions & 2 deletions
This file was deleted.

.ci/appveyor_tests.bat

Lines changed: 0 additions & 3 deletions
This file was deleted.

.ci/linux_build.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
set -e -x
4+
5+
export PATH="$(pwd)/.dotnet:${PATH}"
6+
7+
python -m pip install -U -e .[dev]
8+
python setup.py webhost

.ci/linux_install.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
set -e -x
4+
5+
mkdir .dotnet
6+
wget https://raw.githubusercontent.com/dotnet/cli/80d542b8f4eff847a0f72dc8f2c2a29851272778/scripts/obtain/dotnet-install.sh
7+
chmod +x dotnet-install.sh
8+
./dotnet-install.sh --version ${DOTNET_VERSION} --install-dir .dotnet
9+
10+
.dotnet/dotnet --info
11+
python --version

.ci/travis_tests.sh renamed to .ci/linux_tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
set -e -x
44

5-
dotnet --version
6-
python --version
5+
export PATH="$(pwd)/.dotnet:${PATH}"
76

87
python setup.py test

.ci/travis_install.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

.ci/win_build.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
python -m pip install -U -e .[dev]
2+
python setup.py webhost

.ci/win_tests.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
python .ci\appveyor_setup_worker.py > worker_path
2+
set /p PYAZURE_WORKER_DIR=<worker_path
3+
python setup.py test

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
dist: trusty
22

3+
env:
4+
- DOTNET_CLI_TELEMETRY_OPTOUT=1 DOTNET_VERSION=2.1.300
5+
36
branches:
47
only:
58
- master
69
- dev
10+
- ci
711

812
language: python
913
python:
@@ -17,14 +21,16 @@ addons:
1721

1822
packages:
1923
- libunwind8
20-
- dotnet-sdk-2.1.300
2124
- azure-functions-core-tools
2225

2326
cache:
2427
pip: true
2528

29+
before_install:
30+
- .ci/linux_install.sh
31+
2632
install:
27-
- .ci/travis_install.sh
33+
- .ci/linux_build.sh
2834

2935
script:
30-
- .ci/travis_tests.sh
36+
- .ci/linux_tests.sh

0 commit comments

Comments
 (0)