Skip to content

Commit bebd393

Browse files
Cleanup GitHub workflows (#266)
* Update test_packages.yml Replace deprecated workflow cleanup job * Remove deprecated action * Remove deprecated action * Remove space * Remove space * Remove space
1 parent 5cb2748 commit bebd393

File tree

3 files changed

+13
-32
lines changed

3 files changed

+13
-32
lines changed

Diff for: .github/workflows/test_packages.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@ on:
77
schedule:
88
- cron: '0 23 * * *'
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
defaults:
1115
run:
1216
shell: bash
1317

1418

1519
jobs:
16-
cleanup-runs:
17-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: rokroskar/workflow-run-cleanup-action@master
21-
env:
22-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2320
test-wheel:
24-
needs: cleanup-runs
2521
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
2622
strategy:
2723
matrix:
@@ -70,7 +66,6 @@ jobs:
7066
pip install opendr-toolkit
7167
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
7268
test-docker:
73-
needs: cleanup-runs
7469
if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
7570
strategy:
7671
matrix:

Diff for: .github/workflows/tests_suite.yml

+4-11
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ on:
66
schedule:
77
- cron: '0 23 * * *'
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
defaults:
1014
run:
1115
shell: bash
1216

1317
jobs:
14-
cleanup-runs:
15-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
16-
runs-on: ubuntu-latest
17-
steps:
18-
- uses: rokroskar/workflow-run-cleanup-action@master
19-
env:
20-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2118
test-sources:
22-
needs: cleanup-runs
2319
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
2420
strategy:
2521
matrix:
@@ -51,7 +47,6 @@ jobs:
5147
pip install -r tests/requirements.txt
5248
python -m unittest discover -s tests
5349
test-tools:
54-
needs: cleanup-runs
5550
if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
5651
strategy:
5752
matrix:
@@ -115,7 +110,6 @@ jobs:
115110
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
116111
fi
117112
build-wheel:
118-
needs: cleanup-runs
119113
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
120114
runs-on: ubuntu-20.04
121115
steps:
@@ -140,7 +134,6 @@ jobs:
140134
path:
141135
dist/*.tar.gz
142136
build-docker:
143-
needs: cleanup-runs
144137
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
145138
runs-on: ubuntu-20.04
146139
steps:

Diff for: .github/workflows/tests_suite_develop.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ on:
66
schedule:
77
- cron: '0 23 * * *'
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
defaults:
1014
run:
1115
shell: bash
1216

1317
jobs:
14-
cleanup-runs:
15-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
16-
runs-on: ubuntu-latest
17-
steps:
18-
- uses: rokroskar/workflow-run-cleanup-action@master
19-
env:
20-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2118
test-sources:
22-
needs: cleanup-runs
2319
if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
2420
strategy:
2521
matrix:
@@ -52,7 +48,6 @@ jobs:
5248
pip install -r tests/requirements.txt
5349
python -m unittest discover -s tests
5450
test-tools:
55-
needs: cleanup-runs
5651
if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
5752
strategy:
5853
matrix:
@@ -117,7 +112,6 @@ jobs:
117112
python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
118113
fi
119114
build-wheel:
120-
needs: cleanup-runs
121115
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
122116
runs-on: ubuntu-20.04
123117
steps:
@@ -143,7 +137,6 @@ jobs:
143137
path:
144138
dist/*.tar.gz
145139
build-docker:
146-
needs: cleanup-runs
147140
if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
148141
runs-on: ubuntu-20.04
149142
steps:
@@ -382,4 +375,4 @@ jobs:
382375
- name: Delete wheel artifacts
383376
uses: geekyeggo/delete-artifact@v1
384377
with:
385-
name: wheel-artifact
378+
name: wheel-artifact

0 commit comments

Comments
 (0)