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

[KED-2961] Tidy CircleCI config #1102

Merged
merged 51 commits into from
Dec 16, 2021
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
596afcc
Pre-tidy
antonymilne Dec 6, 2021
41559c3
Simplify linux e2e_tests
antonymilne Dec 8, 2021
cd084c2
Simplify linux e2e_tests
antonymilne Dec 8, 2021
e608704
Merge remote-tracking branch 'origin/feature/tidy-circleci-config#ked…
antonymilne Dec 8, 2021
d04e4be
Move e2e_tests from command to job
antonymilne Dec 8, 2021
06d11c5
String python version
antonymilne Dec 8, 2021
7454095
Comment out unwanted tests for now
antonymilne Dec 8, 2021
57bd647
Try parametrised command name
antonymilne Dec 8, 2021
a6a5c51
Try conditionals
antonymilne Dec 8, 2021
44a6065
Indent
antonymilne Dec 8, 2021
ed08221
Indent
antonymilne Dec 8, 2021
3549480
Indent
antonymilne Dec 8, 2021
ad325a6
Urgh yaml
antonymilne Dec 8, 2021
7dc51cb
Pass arguments
antonymilne Dec 8, 2021
19372a1
Try win_e2e_tests separately
antonymilne Dec 8, 2021
dd7e884
Merge remote-tracking branch 'origin/feature/tidy-circleci-config#ked…
antonymilne Dec 8, 2021
081b3b0
Try win_e2e_tests separately
antonymilne Dec 8, 2021
bf8a5e0
Oops
antonymilne Dec 8, 2021
f42354d
Fix windows hopefully
antonymilne Dec 8, 2021
2b3b7c6
URgh yaml
antonymilne Dec 8, 2021
f4e8231
Alter lint to matrix
antonymilne Dec 8, 2021
f0a8506
De-parametrise executor
antonymilne Dec 8, 2021
93d8fd5
Rename executors
antonymilne Dec 8, 2021
28f4002
Oops
antonymilne Dec 8, 2021
796cbf9
Add win_pip_compile
antonymilne Dec 8, 2021
9053479
Add win unit tests
antonymilne Dec 8, 2021
71032d6
Add viz build
antonymilne Dec 8, 2021
eec510c
Cosmetic changes
antonymilne Dec 8, 2021
6bfb8c2
Refactor into setup and win_setup
antonymilne Dec 8, 2021
58e19b2
Refactor into setup and win_setup
antonymilne Dec 8, 2021
9f48ef1
Refactor into setup and win_setup
antonymilne Dec 8, 2021
3b10e85
Refactor into setup and win_setup
antonymilne Dec 8, 2021
ba57eb0
Back to parametrised executor
antonymilne Dec 8, 2021
3c3deba
Back to parametrised executor
antonymilne Dec 8, 2021
c8df060
Add unit_tests
antonymilne Dec 8, 2021
3a550b9
Clarify comment
antonymilne Dec 9, 2021
005ef88
Make windows tests required
antonymilne Dec 15, 2021
999f867
Move choco install make
antonymilne Dec 15, 2021
9181eb5
Try removing windows unit tests Python 3.8 special case
antonymilne Dec 15, 2021
ca5686c
Try simplifying windows unit tests
antonymilne Dec 15, 2021
d60574d
Try new test-no-spark
antonymilne Dec 15, 2021
38fbd6a
Add skip for windows 3.6
antonymilne Dec 15, 2021
79e0c31
Nice and simple now!
antonymilne Dec 15, 2021
01b06d8
Nice and simple now!
antonymilne Dec 15, 2021
a103492
Merge remote-tracking branch 'origin/feature/tidy-circleci-config#ked…
antonymilne Dec 15, 2021
60a7303
Merge branch 'main' into feature/tidy-circleci-config#ked-2961
antonymilne Dec 15, 2021
591b7a7
skip for tensorflow
antonymilne Dec 15, 2021
772620c
Merge remote-tracking branch 'origin/feature/tidy-circleci-config#ked…
antonymilne Dec 15, 2021
14b2872
Try again
antonymilne Dec 15, 2021
bae22f8
Special CircleCI config for 3.6
antonymilne Dec 15, 2021
d5df507
Lint AGAIN
antonymilne Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make windows tests required
  • Loading branch information
antonymilne committed Dec 15, 2021
commit 005ef888ac1e83df8e6a2f4a9ce8566b4d4586cf
10 changes: 2 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,16 +365,10 @@ workflows:

- all_circleci_checks_succeeded:
requires:
# Should just have e2e_tests and win_e2e_tests but we need to skip
# win_e2e_tests-3.6 due to `pywin32 is in an unsupported or invalid wheel`
- e2e_tests
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that all tests in the e2e_tests matrix are required, i.e. it's equivalent to

- e2e_tests-3.6
- e2e_tests-3.7
- e2e_tests-3.8

- win_e2e_tests-3.7
- win_e2e_tests-3.8
# Should just have unit_tests and win_unit_tests but we need to skip
# win_unit_tests-3.8 due to `Windows fatal exception: stack overflow`
- win_e2e_tests
- unit_tests
- win_unit_tests-3.6
- win_unit_tests-3.7
- win_unit_tests
- lint
- pip_compile
- win_pip_compile
Expand Down