Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brings back windows testing to CI #685

Merged
merged 44 commits into from Jul 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
ff05849
1st pass on adding windows vm for CI
euri10 May 28, 2020
a7671f7
2nd pass, was testing nothing
euri10 May 28, 2020
1fd49ec
No arrays
euri10 May 28, 2020
69483ad
No arrays 2
euri10 May 28, 2020
2247f5d
No arrays 3
euri10 May 28, 2020
d8c791c
No arrays 4
euri10 May 28, 2020
1a83b67
Removed appveyor PATH export
euri10 May 28, 2020
942a20d
Using scripts on windows CI, will need to write ps1 scripts
euri10 Jul 20, 2020
3519c54
Matrix indent
euri10 Jul 20, 2020
007b114
Location of scripts
euri10 Jul 20, 2020
1c630b7
Hate CI
euri10 Jul 20, 2020
7a6291c
Why ps1 are ignored
euri10 Jul 20, 2020
a9f25f6
Adding ps1 scripts, was globally ignored
euri10 Jul 20, 2020
0e4d199
Chmod +x ps1
euri10 Jul 20, 2020
23efd52
Removing uvloop from win reqs
euri10 Jul 20, 2020
bf05a87
Added install and test.sh scripts, globally ignored wtf
euri10 Jul 20, 2020
a1e4587
Align win reqs to old .travis file
euri10 Jul 20, 2020
8998fd7
Run really on windows ?
euri10 Jul 20, 2020
69c4555
Lost in matrix....
euri10 Jul 20, 2020
740d4c1
Blind ps1
euri10 Jul 20, 2020
2efe2f1
Blind ps1 2nd pass
euri10 Jul 20, 2020
60f4203
Blind ps1 3rd pass
euri10 Jul 20, 2020
0558730
Blind test.ps1 !
euri10 Jul 20, 2020
91a0402
Blind test.ps1 love
euri10 Jul 20, 2020
b91d497
Merge branch 'master' into windows_action
euri10 Jul 20, 2020
dd3d593
Attempt specifying shell explicitely
euri10 Jul 20, 2020
d94417b
Try using bash on windows
euri10 Jul 20, 2020
bfc0558
Detect os for requirements
euri10 Jul 20, 2020
1e535ef
Use sh comparison
euri10 Jul 20, 2020
561234e
Live debug
euri10 Jul 20, 2020
0c1c280
Live debug 2
euri10 Jul 20, 2020
54f7856
More echo
euri10 Jul 20, 2020
b1a62aa
More echo
euri10 Jul 20, 2020
d6c98d1
More echo 2
euri10 Jul 20, 2020
6ce7a55
OSTYPE only in bash
euri10 Jul 20, 2020
18d20fa
OSTYPE seems to be msys
euri10 Jul 20, 2020
659e5e3
Using old names for scripts since we dont need to differentiate now b…
euri10 Jul 20, 2020
9e83480
Removed echo leftovers from live debugging and indented back to 4 spaces
euri10 Jul 21, 2020
1128502
Correct set
euri10 Jul 21, 2020
5ddb0a4
Removin=g unboud variable check
euri10 Jul 21, 2020
ed5896b
Set -x before pip only
euri10 Jul 21, 2020
edd287f
Update install
tomchristie Jul 21, 2020
8e37336
Set -e
euri10 Jul 21, 2020
8a0c8be
Merge branch 'windows_action' of github.com:euri10/uvicorn into windo…
euri10 Jul 21, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/test-suite.yml
Expand Up @@ -9,19 +9,20 @@ on:

jobs:
tests:
name: "Python ${{ matrix.python-version }}"
runs-on: "ubuntu-latest"

name: "Python ${{ matrix.python-version }} ${{ matrix.os }}"
runs-on: "${{ matrix.os }}"
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8"]

os: [windows-latest, ubuntu-latest]
steps:
- uses: "actions/checkout@v2"
- uses: "actions/setup-python@v1"
with:
python-version: "${{ matrix.python-version }}"
- name: "Install dependencies"
run: "scripts/install"
shell: bash
euri10 marked this conversation as resolved.
Show resolved Hide resolved
- name: "Run tests"
run: "scripts/test"
shell: bash
19 changes: 19 additions & 0 deletions requirements_windows.txt
@@ -0,0 +1,19 @@
click
h11

# Optional
websockets==8.*
wsproto==0.13.*

# Testing
autoflake
black
codecov
flake8
isort
pytest
pytest-cov
requests

# Efficient debug reload
watchgod>=0.6,<0.7
10 changes: 8 additions & 2 deletions scripts/install
@@ -1,9 +1,15 @@
#!/bin/sh -e
#!/usr/bin/env bash
tomchristie marked this conversation as resolved.
Show resolved Hide resolved

set -e

# Use the Python executable provided from the `-p` option, or a default.
[ "$1" = "-p" ] && PYTHON=$2 || PYTHON="python3"

REQUIREMENTS="requirements.txt"
if [ "$OSTYPE" = "linux-gnu" ]; then
REQUIREMENTS="requirements.txt"
elif [ "$OSTYPE" = "msys" ]; then
REQUIREMENTS="requirements_windows.txt"
fi
VENV="venv"

set -x
Expand Down