aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwbond <will@wbond.net>2022-01-26 22:34:02 -0500
committerwbond <will@wbond.net>2022-01-26 22:34:02 -0500
commitedaf3f0f967c873d5dd8d625a06eadb197bec99c (patch)
tree2d03f65a26353e312d2e7886a48eb5cb3edb96ef
parent3946793884aa4a00eea55cd4cf91dd113a9f74da (diff)
downloadasn1crypto-edaf3f0f967c873d5dd8d625a06eadb197bec99c.tar.gz
Persistent runner cleanup fixes
-rw-r--r--.github/workflows/ci.yml11
-rw-r--r--dev/ci-cleanup.py4
2 files changed, 12 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55888fb..581e205 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -173,10 +173,16 @@ jobs:
run: python2 run.py deps
- name: Run test suite (2.7)
run: python2 run.py ci-driver
+ - name: Cleanup deps (2.7)
+ if: always()
+ run: python2 run.py ci-cleanup
- name: Install dependencies (3.8)
run: python3 run.py deps
- name: Run test suite (3.8)
run: python3 run.py ci-driver
+ - name: Cleanup deps (3.8)
+ if: always()
+ run: python3 run.py ci-cleanup
build-arm64:
name: Python 2.7/3.8 on arm64
@@ -187,10 +193,13 @@ jobs:
run: python2 run.py deps
- name: Run test suite (2.7)
run: python2 run.py ci-driver
+ - name: Cleanup deps (2.7)
+ if: always()
+ run: python2 run.py ci-cleanup
- name: Install dependencies (3.8)
run: python3 run.py deps
- name: Run test suite (3.8)
run: python3 run.py ci-driver
- - name: Cleanup deps
+ - name: Cleanup deps (3.8)
if: always()
run: python3 run.py ci-cleanup
diff --git a/dev/ci-cleanup.py b/dev/ci-cleanup.py
index ab9c79a..92ca6da 100644
--- a/dev/ci-cleanup.py
+++ b/dev/ci-cleanup.py
@@ -9,8 +9,8 @@ from . import build_root, other_packages
def run():
"""
- Installs required development dependencies. Uses git to checkout other
- modularcrypto repos for more accurate coverage data.
+ Cleans up CI dependencies - used for persistent GitHub Actions
+ Runners since they don't clean themselves up.
"""
print("Removing ci dependencies")