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.

Sign up for GitHub

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

Define “success” as a single CI task, refactor Bors & release config #237

Merged
merged 2 commits into from
Jan 4, 2021
Merged

Define “success” as a single CI task, refactor Bors & release config #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b800d2c
Define “success” as a single CI task, refactor Bors & release config
nbraud Jan 2, 2021
dd363d9
CI: Sad hack to make the “CI success” task work
nbraud Jan 2, 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
23 changes: 16 additions & 7 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Lint_task:
- bork run lint

Zipapp_bootstrap_task:
alias: Zipapp bootstraps
container:
matrix:
image: python:3.7-slim
Expand Down Expand Up @@ -49,6 +50,7 @@ Zipapp_bootstrap_task:


Linux_task:
alias: Linux tests
container:
matrix:
- image: python:3.6-slim
Expand All @@ -64,6 +66,7 @@ Linux_task:
- bork run test

macOS_task:
alias: macOS tests
osx_instance:
image: catalina-xcode
env:
Expand All @@ -88,6 +91,7 @@ macOS_task:
- bork run test

FreeBSD_task:
alias: FreeBSD tests
freebsd_instance:
image_family: freebsd-12-1-snap
env:
Expand Down Expand Up @@ -119,16 +123,21 @@ FreeBSD_task:
# - C:\Python\python.exe --version
# - C:\Python\python.exe -m pytest --verbose

# If bork/version.py is modified on the master branch, make a release.
Release_task:
only_if: "changesInclude('bork/version.py') && $BRANCH == 'master' && $CIRRUS_CRON == ''"
success_task:
name: CI success
container: {image: "busybox"}
depends_on:
- FreeBSD tests
- Linux tests
- macOS tests
- Zipapp bootstraps
- Lint
- Zipapp_bootstrap
- Linux
- macOS
- FreeBSD
#- Windows

# If bork/version.py is modified on the master branch, make a release.
Release_task:
only_if: "changesInclude('bork/version.py') && $BRANCH == 'master' && $CIRRUS_CRON == ''"
depends_on: [CI success]
env:
TWINE_USERNAME: "__token__"
TWINE_PASSWORD: ENCRYPTED[00007524e18bea7b59efea288653efa57b1dbd235ed8af00cc325febfc9076631a2bf58ed330d8fa7ca057adb81579b0]
Expand Down
18 changes: 1 addition & 17 deletions bors.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
status = [
"FreeBSD PYTHON:3.6",
"FreeBSD PYTHON:3.7",
"FreeBSD PYTHON:3.8",
"Lint",
"Linux container:python:3.6-slim",
"Linux container:python:3.7-slim",
"Linux container:python:3.8-slim",
"Linux container:python:3.9-slim",
"Zipapp_bootstrap container:python:3.7-slim",
"Zipapp_bootstrap container:python:3.8-slim",
"Zipapp_bootstrap container:python:3.9-slim",
"macOS PYTHON:3.6.9",
"macOS PYTHON:3.7.9",
"macOS PYTHON:3.8.6",
"macOS PYTHON:3.9.0",
]
status = [ "CI success" ]

delete_merged_branches = true